outerbounds 0.3.61__py3-none-any.whl → 0.3.63__py3-none-any.whl

outerbounds/command_groups/local_setup_cli.py

@@ -30,7 +30,8 @@ the Outerbounds platform.
 To remove that package, please try `python -m pip uninstall metaflow -y` or reach out to Outerbounds support.
 After uninstalling the Metaflow package, please reinstall the Outerbounds package using `python -m pip
 install outerbounds --force`.
-As always, please reach out to Outerbounds support for any questions."""
+As always, please reach out to Outerbounds support for any questions.
+"""
 
 MISSING_EXTENSIONS_MESSAGE = (
     "The Outerbounds Platform extensions for Metaflow was not found."
@@ -55,11 +56,11 @@ class Narrator:
 
     def section_ok(self):
         if not self.verbose:
-            click.secho("\U0001F600", err=True)
+            click.secho("\U00002705", err=True)
 
     def section_not_ok(self):
         if not self.verbose:
-            click.secho("\U0001F641", err=True)
+            click.secho("\U0000274C", err=True)
 
     def announce_check(self, name):
         if self.verbose:
@@ -233,17 +234,9 @@ class ConfigEntrySpec:
         self.expected = expected
 
 
-def get_config_specs():
-    return [
-        ConfigEntrySpec(
-            "METAFLOW_DATASTORE_SYSROOT_S3",
-            r"s3://[a-z0-9\-]+/metaflow(-[a-z0-9\-]+)?[/]?",
-        ),
-        ConfigEntrySpec(
-            "METAFLOW_DATATOOLS_S3ROOT", r"s3://[a-z0-9\-]+/data(-[a-z0-9\-]+)?[/]?"
-        ),
+def get_config_specs(default_datastore: str):
+    spec = [
         ConfigEntrySpec("METAFLOW_DEFAULT_AWS_CLIENT_PROVIDER", "obp", expected="obp"),
-        ConfigEntrySpec("METAFLOW_DEFAULT_DATASTORE", "s3", expected="s3"),
         ConfigEntrySpec("METAFLOW_DEFAULT_METADATA", "service", expected="service"),
         ConfigEntrySpec("METAFLOW_KUBERNETES_NAMESPACE", r"jobs-.*"),
         ConfigEntrySpec("METAFLOW_KUBERNETES_SANDBOX_INIT_SCRIPT", r"eval \$\(.*"),
@@ -253,6 +246,21 @@ def get_config_specs():
         ConfigEntrySpec("OBP_AUTH_SERVER", r"auth\..*"),
     ]
 
+    if default_datastore == "s3":
+        spec.extend(
+            [
+                ConfigEntrySpec(
+                    "METAFLOW_DATASTORE_SYSROOT_S3",
+                    r"s3://[a-z0-9\-]+/metaflow(-[a-z0-9\-]+)?[/]?",
+                ),
+                ConfigEntrySpec(
+                    "METAFLOW_DATATOOLS_S3ROOT",
+                    r"s3://[a-z0-9\-]+/data(-[a-z0-9\-]+)?[/]?",
+                ),
+            ]
+        )
+    return spec
+
 
 def check_metaflow_config(narrator: Narrator) -> CommandStatus:
     narrator.announce_section("local Metaflow config")
@@ -269,7 +277,14 @@ def check_metaflow_config(narrator: Narrator) -> CommandStatus:
     )
 
     config = metaflowconfig.init_config(config_dir, profile)
-    for spec in get_config_specs():
+
+    if "OBP_METAFLOW_CONFIG_URL" in config:
+        # If the config is fetched from a remote source, not much to check
+        narrator.announce_check("config entry OBP_METAFLOW_CONFIG_URL")
+        narrator.ok()
+        return check_status
+
+    for spec in get_config_specs(config.get("METAFLOW_DEFAULT_DATASTORE", "")):
         narrator.announce_check("config entry " + spec.name)
         if spec.name not in config:
             reason = "Missing"
@@ -621,6 +636,7 @@ class ConfigurationWriter:
         self.decoded_config = deserialize(self.encoded_config)
 
     def process_decoded_config(self):
+        assert self.decoded_config is not None
         config_type = self.decoded_config.get("OB_CONFIG_TYPE", "inline")
         if config_type == "inline":
             if "OBP_PERIMETER" in self.decoded_config:
@@ -663,6 +679,7 @@ class ConfigurationWriter:
             return path.join(self.out_dir, "config_{}.json".format(self.profile))
 
     def display(self):
+        assert self.decoded_config is not None
         # Create a copy so we can use the real config later, possibly
         display_config = dict()
         for k in self.decoded_config.keys():
@@ -677,6 +694,7 @@ class ConfigurationWriter:
         return self.confirm_overwrite_config(self.path())
 
     def write_config(self):
+        assert self.decoded_config is not None
         config_path = self.path()
         # TODO config contains auth token - restrict file/dir modes
         os.makedirs(os.path.dirname(config_path), exist_ok=True)
@@ -861,7 +879,7 @@ def check(no_config, verbose, output, workstation=False):
 )
 @click.argument("encoded_config", required=True)
 def configure(
-    encoded_config=None, config_dir=None, profile=None, echo=None, force=False
+    encoded_config: str, config_dir=None, profile=None, echo=None, force=False
 ):
     writer = ConfigurationWriter(encoded_config, config_dir, profile)
     try:

outerbounds/utils/metaflowconfig.py

@@ -3,7 +3,6 @@ import json
 import os
 import requests
 from os import path
-import requests
 from typing import Dict
 import sys
 

{outerbounds-0.3.61.dist-info → outerbounds-0.3.63.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: outerbounds
-Version: 0.3.61
+Version: 0.3.63
 Summary: More Data Science, Less Administration
 License: Proprietary
 Keywords: data science,machine learning,MLOps
@@ -23,9 +23,9 @@ Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: google-api-core (>=2.16.1,<3.0.0) ; extra == "gcp"
 Requires-Dist: google-auth (>=2.27.0,<3.0.0) ; extra == "gcp"
 Requires-Dist: google-cloud-storage (>=2.14.0,<3.0.0) ; extra == "gcp"
-Requires-Dist: ob-metaflow (==2.11.9.1)
-Requires-Dist: ob-metaflow-extensions (==1.1.51)
-Requires-Dist: ob-metaflow-stubs (==2.11.9.1)
+Requires-Dist: ob-metaflow (==2.11.10.3)
+Requires-Dist: ob-metaflow-extensions (==1.1.54)
+Requires-Dist: ob-metaflow-stubs (==3.1)
 Requires-Dist: opentelemetry-distro (==0.41b0)
 Requires-Dist: opentelemetry-exporter-otlp-proto-http (==1.20.0)
 Requires-Dist: opentelemetry-instrumentation-requests (==0.41b0)

{outerbounds-0.3.61.dist-info → outerbounds-0.3.63.dist-info}/RECORD

@@ -2,14 +2,14 @@ outerbounds/__init__.py,sha256=GPdaubvAYF8pOFWJ3b-sPMKCpyfpteWVMZWkmaYhxRw,32
 outerbounds/cli_main.py,sha256=e9UMnPysmc7gbrimq2I4KfltggyU7pw59Cn9aEguVcU,74
 outerbounds/command_groups/__init__.py,sha256=QPWtj5wDRTINDxVUL7XPqG3HoxHNvYOg08EnuSZB2Hc,21
 outerbounds/command_groups/cli.py,sha256=H4LxcYTmsY9DQUrReSRLjvbg9s9Ro7s-eUrcMqEJ_9A,261
-outerbounds/command_groups/local_setup_cli.py,sha256=UqyYUTKyGRDxzr2v4cl-UXmzTkYNNJ6V0DH_AJea3bc,35968
+outerbounds/command_groups/local_setup_cli.py,sha256=Xqb-tsAkYgc90duC_6COSR9MsDpMNiKigQxlXUUYfN0,36530
 outerbounds/command_groups/perimeters_cli.py,sha256=OxbxYQnHZDLRb3SFaVpD2mjp8W8s1fvK1Wc4htyRuGw,12757
 outerbounds/command_groups/workstations_cli.py,sha256=b5lt8_g2B0zCoUoNriTRv32IPB6E4mI2sUhubDT7Yjo,21966
 outerbounds/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 outerbounds/utils/kubeconfig.py,sha256=l1mUP1j9VIq3fsffi5bJ1Nk-hYlwd1dIqkpj7DvVS1E,7936
-outerbounds/utils/metaflowconfig.py,sha256=cQWD7zoVkOPXd6q2tqmqACjL0IN-0RgiQ45ojxXBYSM,3529
+outerbounds/utils/metaflowconfig.py,sha256=JkhT2yOGpN7t2R2p9uaUJRDJU9fqFPwn4DcojjVnJMI,3513
 outerbounds/utils/schema.py,sha256=cNlgjmteLPbDzSEUSQDsq8txdhMGyezSmM83jU3aa0w,2329
-outerbounds-0.3.61.dist-info/METADATA,sha256=0encUZvpDTirlMhoNd1cWIRHm4EZAlC8Kp7Wmc_y9FA,1407
-outerbounds-0.3.61.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-outerbounds-0.3.61.dist-info/entry_points.txt,sha256=7ye0281PKlvqxu15rjw60zKg2pMsXI49_A8BmGqIqBw,47
-outerbounds-0.3.61.dist-info/RECORD,,
+outerbounds-0.3.63.dist-info/METADATA,sha256=TOtpihvC2KTSD-q6Ns1VkTWrCPTWJ-QI8Vr-4FyPJpg,1403
+outerbounds-0.3.63.dist-info/entry_points.txt,sha256=7ye0281PKlvqxu15rjw60zKg2pMsXI49_A8BmGqIqBw,47
+outerbounds-0.3.63.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+outerbounds-0.3.63.dist-info/RECORD,,