outerbounds 0.3.176rc2__py3-none-any.whl → 0.3.176rc4__py3-none-any.whl

outerbounds/apps/app_cli.py

@@ -525,9 +525,8 @@ def _parse_capsule_table(filtered_capsules):
 
     for capsule in filtered_capsules:
         spec = capsule.get("spec", {})
-        status = capsule.get("status", {})
+        status = capsule.get("status", {}) or {}
         cap_id = capsule.get("id")
-
         display_name = spec.get("displayName", "")
         ready = str(status.get("readyToServeTraffic", False))
         auth_type = spec.get("authConfig", {}).get("authType", "")
@@ -535,7 +534,8 @@ def _parse_capsule_table(filtered_capsules):
         tags_str = ", ".join(
             [f"{tag['key']}={tag['value']}" for tag in spec.get("tags", [])]
         )
-        url = status.get("accessInfo", {}).get("outOfClusterURL", "")
+        access_info = status.get("accessInfo", {}) or {}
+        url = access_info.get("outOfClusterURL", None)
 
         table_data.append(
             [
@@ -545,7 +545,7 @@ def _parse_capsule_table(filtered_capsules):
                 auth_type,
                 port,
                 tags_str,
-                f"https://{url}",
+                f"https://{url}" if url else "URL not available",
             ]
         )
     return headers, table_data

outerbounds/apps/capsule.py

@@ -70,14 +70,16 @@ class CapsuleStateMachine:
 
     @property
     def out_of_cluster_url(self):
-        url = self.current_status.get("accessInfo", {}).get("outOfClusterURL", None)
+        access_info = self.current_status.get("accessInfo", {}) or {}
+        url = access_info.get("outOfClusterURL", None)
         if url is not None:
             return f"https://{url}"
         return None
 
     @property
     def in_cluster_url(self):
-        url = self.current_status.get("accessInfo", {}).get("inClusterURL", None)
+        access_info = self.current_status.get("accessInfo", {}) or {}
+        url = access_info.get("inClusterURL", None)
         if url is not None:
             return f"https://{url}"
         return None
@@ -169,9 +171,11 @@ class CapsuleInput:
 
         _scheduling_config = {}
         if app_config.get_state("compute_pools", None):
-            _scheduling_config["computePools"] = [
-                {"name": x} for x in app_config.get_state("compute_pools")
-            ]
+            _scheduling_config["schedulingConfig"] = {
+                "computePools": [
+                    {"name": x} for x in app_config.get_state("compute_pools")
+                ]
+            }
         _description = app_config.get_state("description")
         _app_type = app_config.get_state("app_type")
         _final_info = {}
@@ -230,7 +234,7 @@ def create_capsule(capsule_input: dict, api_url: str, request_headers: dict):
         retryable_status_codes=[409],  # todo : verify me
     )
 
-    if response.status_code > 400:
+    if response.status_code >= 400:
         raise TODOException(
             f"Failed to create capsule: {response.status_code} {response.text}"
         )
@@ -245,7 +249,7 @@ def list_capsules(api_url: str, request_headers: dict):
         retryable_status_codes=[409],  # todo : verify me
         conn_error_retries=3,
     )
-    if response.status_code > 400:
+    if response.status_code >= 400:
         raise TODOException(
             f"Failed to list capsules: {response.status_code} {response.text}"
         )
@@ -262,7 +266,7 @@ def get_capsule(capsule_id: str, api_url: str, request_headers: dict):
         retryable_status_codes=[409, 404],  # todo : verify me
         conn_error_retries=3,
     )
-    if response.status_code > 400:
+    if response.status_code >= 400:
         raise TODOException(
             f"Failed to get capsule: {response.status_code} {response.text}"
         )
@@ -277,7 +281,7 @@ def delete_capsule(capsule_id: str, api_url: str, request_headers: dict):
         headers=request_headers,
         retryable_status_codes=[409],  # todo : verify me
     )
-    if response.status_code > 400:
+    if response.status_code >= 400:
         raise TODOException(
             f"Failed to delete capsule: {response.status_code} {response.text}"
         )
@@ -312,10 +316,7 @@ def list_and_filter_capsules(
         return False
 
     def _all_tags_match(tags, tags_to_match):
-        for t in tags_to_match:
-            if _tags_match(tags, t["key"], t["value"]):
-                return True
-        return False
+        return all([_tags_match(tags, t["key"], t["value"]) for t in tags_to_match])
 
     def _filter_capsules(capsules, project, branch, name, tags, auth_type, capsule_id):
         _filtered_capsules = []
@@ -366,7 +367,7 @@ class Capsule:
         _capsules = list_capsules(base_url, request_headers)
         if "capsules" not in _capsules:
             raise TODOException(f"Failed to list capsules")
-        return _capsules.get("capsules", [])
+        return _capsules.get("capsules", []) or []
 
     @classmethod
     def delete(cls, identifier: str, base_url: str, perimeter: str):
@@ -451,6 +452,7 @@ class Capsule:
             "💊 Waiting for %s %s to be ready to serve traffic"
             % (self.capsule_type.lower(), self.identifier)
         )
+        self.status = state_machine
         for i in range(self._create_timeout):
             capsule_response = self.get()
             state_machine.add_status(capsule_response.get("status", {}))
@@ -465,9 +467,12 @@ class Capsule:
                         state_machine.out_of_cluster_url,
                     ),
                 )
-                self.status = state_machine
                 break
             if self._debug_dir:
                 state_machine.check_for_debug(self._debug_dir)
 
+        if not self.status.ready_to_serve_traffic:
+            raise TODOException(
+                f"Capsule {self.identifier} failed to be ready to serve traffic"
+            )
         return capsule_response

outerbounds/apps/config_schema.yaml

@@ -53,7 +53,7 @@ properties:
     description: Outerbounds integrations to attach to the app. You can use the value you set in the `@secrets` decorator in your code.
     items:
       type: string
-    example: ["outerbounds.hf-token"]
+    example: ["hf-token"]
   environment: # Used in `run` command
     # Todo: So this part might not be best on the CLI. We should probably have a better way to handle this.
     # In simplicity, we can just JSON dump anything that looks like a dict/list/

{outerbounds-0.3.176rc2.dist-info → outerbounds-0.3.176rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: outerbounds
-Version: 0.3.176rc2
+Version: 0.3.176rc4
 Summary: More Data Science, Less Administration
 License: Proprietary
 Keywords: data science,machine learning,MLOps
@@ -29,8 +29,8 @@ Requires-Dist: google-cloud-secret-manager (>=2.20.0,<3.0.0) ; extra == "gcp"
 Requires-Dist: google-cloud-storage (>=2.14.0,<3.0.0) ; extra == "gcp"
 Requires-Dist: metaflow-checkpoint (==0.2.1)
 Requires-Dist: ob-metaflow (==2.15.14.1)
-Requires-Dist: ob-metaflow-extensions (==1.1.163rc3)
-Requires-Dist: ob-metaflow-stubs (==6.0.3.176rc2)
+Requires-Dist: ob-metaflow-extensions (==1.1.163rc6)
+Requires-Dist: ob-metaflow-stubs (==6.0.3.176rc4)
 Requires-Dist: opentelemetry-distro (>=0.41b0) ; extra == "otel"
 Requires-Dist: opentelemetry-exporter-otlp-proto-http (>=1.20.0) ; extra == "otel"
 Requires-Dist: opentelemetry-instrumentation-requests (>=0.41b0) ; extra == "otel"

{outerbounds-0.3.176rc2.dist-info → outerbounds-0.3.176rc4.dist-info}/RECORD

@@ -40,15 +40,15 @@ outerbounds/_vendor/yaml/scanner.py,sha256=ZcI8IngR56PaQ0m27WU2vxCqmDCuRjz-hr7pi
 outerbounds/_vendor/yaml/serializer.py,sha256=8wFZRy9SsQSktF_f9OOroroqsh4qVUe53ry07P9UgCc,4368
 outerbounds/_vendor/yaml/tokens.py,sha256=JBSu38wihGr4l73JwbfMA7Ks1-X84g8-NskTz7KwPmA,2578
 outerbounds/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-outerbounds/apps/app_cli.py,sha256=kAKanVOVdBKI82ihAkRL2XcCLYyA-qkr_4FPS9xY-XI,23377
+outerbounds/apps/app_cli.py,sha256=zbzFOYpRkgFVtBhcZGl0sn8BkL6w0uc9PNMx25CECfA,23456
 outerbounds/apps/app_config.py,sha256=KBmW9grhiuG9XZG-R0GZkM-024cjj6ztGzOX_2wZW34,11291
 outerbounds/apps/artifacts.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-outerbounds/apps/capsule.py,sha256=8UC0MXn3SeLBwX8k3ej5Uiqy6U5tcynIrNFZ0GRqFNk,16696
+outerbounds/apps/capsule.py,sha256=C0xxsGNmsBiwTdybS38jYfLn8VzMp0mQLI6pssha1UY,16965
 outerbounds/apps/cli_to_config.py,sha256=hV6rfPgCiAX03O363GkvdjSIJBt3-oSbL6F2sTUucFE,3195
 outerbounds/apps/code_package/__init__.py,sha256=8McF7pgx8ghvjRnazp2Qktlxi9yYwNiwESSQrk-2oW8,68
 outerbounds/apps/code_package/code_packager.py,sha256=SQDBXKwizzpag5GpwoZpvvkyPOodRSQwk2ecAAfO0HI,23316
 outerbounds/apps/code_package/examples.py,sha256=aF8qKIJxCVv_ugcShQjqUsXKKKMsm1oMkQIl8w3QKuw,4016
-outerbounds/apps/config_schema.yaml,sha256=bN7mXlVddqN8G4jq6qBpVXl_qFJdOYrmj8E4OY23Rr8,8641
+outerbounds/apps/config_schema.yaml,sha256=R1sSKFroqCSkcJScdAKU2vCvhgdFt_PJNZzecHB1oe0,8629
 outerbounds/apps/dependencies.py,sha256=SqvdFQdFZZW0wXX_CHMHCrfE0TwaRkTvGCRbQ2Mx3q0,3935
 outerbounds/apps/deployer.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 outerbounds/apps/experimental/__init__.py,sha256=12L_FzZyzv162uo4I6cmlrxat7feUtIu_kxbObTJZTA,3059
@@ -72,7 +72,7 @@ outerbounds/utils/metaflowconfig.py,sha256=l2vJbgPkLISU-XPGZFaC8ZKmYFyJemlD6bwB-
 outerbounds/utils/schema.py,sha256=lMUr9kNgn9wy-sO_t_Tlxmbt63yLeN4b0xQXbDUDj4A,2331
 outerbounds/utils/utils.py,sha256=4Z8cszNob_8kDYCLNTrP-wWads_S_MdL3Uj3ju4mEsk,501
 outerbounds/vendor.py,sha256=gRLRJNXtZBeUpPEog0LOeIsl6GosaFFbCxUvR4bW6IQ,5093
-outerbounds-0.3.176rc2.dist-info/METADATA,sha256=sv3uctge_hMpjW2RR9Il9aD6N1d_bIIXfYvnjcdtL9c,1846
-outerbounds-0.3.176rc2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-outerbounds-0.3.176rc2.dist-info/entry_points.txt,sha256=7ye0281PKlvqxu15rjw60zKg2pMsXI49_A8BmGqIqBw,47
-outerbounds-0.3.176rc2.dist-info/RECORD,,
+outerbounds-0.3.176rc4.dist-info/METADATA,sha256=bF2r5YAzE_L92TOuSGmgpNuFvqQb73q-boJXB_cF6Gs,1846
+outerbounds-0.3.176rc4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+outerbounds-0.3.176rc4.dist-info/entry_points.txt,sha256=7ye0281PKlvqxu15rjw60zKg2pMsXI49_A8BmGqIqBw,47
+outerbounds-0.3.176rc4.dist-info/RECORD,,