outerbounds 0.3.93__py3-none-any.whl → 0.3.95__py3-none-any.whl

outerbounds/command_groups/apps_cli.py

@@ -56,6 +56,21 @@ def app(**kwargs):
     type=click.Choice(["json", ""]),
 )
 def start(config_dir=None, profile=None, port=-1, name="", output=""):
+    if len(name) == 0 or len(name) >= 20:
+        click.secho(
+            "App name should not be more than 20 characters long.",
+            fg="red",
+            err=True,
+        )
+        return
+    elif not name.isalnum() or not name.islower():
+        click.secho(
+            "App name can only contain lowercase alphanumeric characters.",
+            fg="red",
+            err=True,
+        )
+        return
+
     start_app_response = OuterboundsCommandResponse()
 
     validate_workstation_step = CommandStatus(
@@ -70,10 +85,10 @@ def start(config_dir=None, profile=None, port=-1, name="", output=""):
         "List of workstations fetched.",
     )
 
-    validate_port_exists = CommandStatus(
-        "ValidatePortExists",
+    validate_request = CommandStatus(
+        "ValidateRequest",
         OuterboundsCommandStatus.OK,
-        "Port exists on workstation",
+        "Start app request is valid.",
     )
 
     start_app_step = CommandStatus(
@@ -127,12 +142,31 @@ def start(config_dir=None, profile=None, port=-1, name="", output=""):
         for workstation in workstations_json:
             if workstation["instance_id"] == os.environ["WORKSTATION_ID"]:
                 if "named_ports" in workstation["spec"]:
+                    try:
+                        ensure_app_start_request_is_valid(
+                            workstation["spec"]["named_ports"], port, name
+                        )
+                    except ValueError as e:
+                        click.secho(str(e), fg="red", err=True)
+                        validate_request.update(
+                            OuterboundsCommandStatus.FAIL,
+                            str(e),
+                            "",
+                        )
+                        start_app_response.add_step(validate_request)
+                        if output == "json":
+                            click.echo(
+                                json.dumps(start_app_response.as_dict(), indent=4)
+                            )
+                        return
+
+                    start_app_response.add_step(validate_request)
+
                     for named_port in workstation["spec"]["named_ports"]:
                         if int(named_port["port"]) == port:
-                            start_app_response.add_step(validate_port_exists)
                             if named_port["enabled"] and named_port["name"] == name:
                                 click.secho(
-                                    f"App {name} started on port {port}!",
+                                    f"App {name} already running on port {port}!",
                                     fg="green",
                                     err=True,
                                 )
@@ -167,7 +201,12 @@ def start(config_dir=None, profile=None, port=-1, name="", output=""):
                                         fg="green",
                                         err=True,
                                     )
-                                except:
+                                    click.secho(
+                                        f"App URL: {api_url.replace('api', 'ui')}/apps/{os.environ['WORKSTATION_ID']}/{name}/",
+                                        fg="green",
+                                        err=True,
+                                    )
+                                except Exception:
                                     click.secho(
                                         f"Failed to start app {name} on port {port}!",
                                         fg="red",
@@ -187,20 +226,6 @@ def start(config_dir=None, profile=None, port=-1, name="", output=""):
                                         )
                                     )
                                 return
-
-        click.secho(
-            f"Port {port} not found on workstation {os.environ['WORKSTATION_ID']}",
-            fg="red",
-            err=True,
-        )
-        validate_port_exists.update(
-            OuterboundsCommandStatus.FAIL,
-            f"Port {port} not found on workstation {os.environ['WORKSTATION_ID']}",
-            "",
-        )
-        start_app_response.add_step(validate_port_exists)
-        if output == "json":
-            click.echo(json.dumps(start_app_response.as_dict(), indent=4))
     except Exception as e:
         click.secho(f"Failed to start app {name} on port {port}!", fg="red", err=True)
         start_app_step.update(
@@ -256,6 +281,13 @@ def stop(config_dir=None, profile=None, port=-1, name="", output=""):
             err=True,
         )
         return
+    elif port > 0 and name:
+        click.secho(
+            "Please provide either a port number or a name to stop the app, not both.",
+            fg="red",
+            err=True,
+        )
+        return
 
     stop_app_response = OuterboundsCommandResponse()
 
@@ -324,6 +356,7 @@ def stop(config_dir=None, profile=None, port=-1, name="", output=""):
                 click.echo(json.dumps(stop_app_response.as_dict(), indent=4))
             return
 
+        app_found = False
         workstations_json = workstations_response.json()["workstations"]
         for workstation in workstations_json:
             if workstation["instance_id"] == os.environ["WORKSTATION_ID"]:
@@ -333,47 +366,34 @@ def stop(config_dir=None, profile=None, port=-1, name="", output=""):
                             int(named_port["port"]) == port
                             or named_port["name"] == name
                         ):
+                            app_found = True
                             stop_app_response.add_step(validate_port_exists)
-                            if not named_port["enabled"]:
-                                click.secho(
-                                    f"App {named_port['name']} stopped on port {port}!",
-                                    fg="green",
-                                    err=True,
-                                )
-                                stop_app_response.add_step(stop_app_step)
-                                if output == "json":
-                                    click.echo(
-                                        json.dumps(
-                                            stop_app_response.as_dict(), indent=4
-                                        )
-                                    )
-                                return
-                            else:
+                            if named_port["enabled"]:
                                 try:
                                     response = requests.put(
                                         f"{api_url}/v1/workstations/update/{os.environ['WORKSTATION_ID']}/namedports",
                                         headers={"x-api-key": metaflow_token},
                                         json={
-                                            "port": port,
+                                            "port": named_port["port"],
                                             "name": named_port["name"],
                                             "enabled": False,
                                         },
                                     )
                                     response.raise_for_status()
                                     click.secho(
-                                        f"App stopped on port {port}!",
+                                        f"App {named_port['name']} stopped on port {named_port['port']}!",
                                         fg="green",
                                         err=True,
                                     )
-                                except:
+                                except Exception as e:
                                     click.secho(
-                                        f"Failed to stop app on port {port}!",
+                                        f"Failed to stop app {named_port['name']} on port {named_port['port']}!",
                                         fg="red",
                                         err=True,
                                     )
                                     stop_app_step.update(
                                         OuterboundsCommandStatus.FAIL,
-                                        f"Failed to stop app on port {port}!",
+                                        f"Failed to stop app {named_port['name']} on port {named_port['port']}!",
                                         "",
                                     )
 
@@ -386,13 +406,27 @@ def stop(config_dir=None, profile=None, port=-1, name="", output=""):
                                     )
                                 return
 
+        if app_found:
+            already_stopped_message = (
+                f"No deployed app named {name} found."
+                if name
+                else f"There is no app deployed on port {port}"
+            )
+            click.secho(
+                already_stopped_message,
+                fg="green",
+                err=True,
+            )
+            stop_app_response.add_step(stop_app_step)
+            if output == "json":
+                click.echo(json.dumps(stop_app_response.as_dict(), indent=4))
+            return
+
         err_message = (
-            f"Port {port} not found on workstation {os.environ['WORKSTATION_ID']}"
+            (f"Port {port} not found on workstation {os.environ['WORKSTATION_ID']}")
+            if port != -1
+            else f"App {name} not found on workstation {os.environ['WORKSTATION_ID']}"
         )
-        if port == -1:
-            err_message = (
-                f"App {name} not found on workstation {os.environ['WORKSTATION_ID']}"
-            )
 
         click.secho(
             err_message,
@@ -532,4 +566,21 @@ def list(config_dir=None, profile=None, output=""):
             click.echo(json.dumps(list_app_response.as_dict(), indent=4))
 
 
+def ensure_app_start_request_is_valid(existing_named_ports, port: int, name: str):
+    existing_apps_by_port = {np["port"]: np for np in existing_named_ports}
+
+    if port not in existing_apps_by_port:
+        raise ValueError(f"Port {port} not found on workstation")
+
+    for existing_named_port in existing_named_ports:
+        if (
+            name == existing_named_port["name"]
+            and existing_named_port["port"] != port
+            and existing_named_port["enabled"]
+        ):
+            raise ValueError(
+                f"App with name '{name}' is already deployed on port {existing_named_port['port']}"
+            )
+
+
 cli.add_command(app, name="app")

outerbounds/command_groups/local_setup_cli.py

@@ -5,7 +5,6 @@ import os
 import re
 import subprocess
 import sys
-import time
 import zlib
 from base64 import b64decode, b64encode
 from importlib.machinery import PathFinder
@@ -16,10 +15,6 @@ from outerbounds._vendor import click
 import requests
 from requests.exceptions import HTTPError
 
-from google.oauth2 import service_account
-import google.auth
-import google.auth.jwt
-
 from ..utils import kubeconfig, metaflowconfig
 from ..utils.schema import (
     CommandStatus,
@@ -767,48 +762,6 @@ def get_gha_jwt(audience: str):
     sys.exit(1)
 
 
-def get_gcp_jwt(audience: str, service_account_token_file_path: str = ""):
-    try:
-        if service_account_token_file_path != "":
-            credentials = service_account.Credentials.from_service_account_file(
-                service_account_token_file_path
-            )
-        else:
-            credentials, project = google.auth.default()
-    except Exception as e:
-        click.secho(
-            f"Failed to get Google Cloud service account credentials. Error: {str(e)}",
-            fg="red",
-        )
-        sys.exit(1)
-
-    # Ensure the credentials are service account credentials to sign the JWT
-    if isinstance(credentials, service_account.Credentials):
-        try:
-            payload = {
-                "iat": int(time.time()),  # Issued at time
-                "exp": int(time.time()) + 172800,  # 48 hours expiration time
-                "sub": credentials.service_account_email,
-                "aud": audience,
-                "sa_email": credentials.service_account_email,
-            }
-
-            signed_jwt = google.auth.jwt.encode(credentials.signer, payload)
-            return signed_jwt.decode("utf-8")
-        except Exception as e:
-            click.secho(
-                f"Failed to sign JWT token using Google Cloud service account credentials. Error: {str(e)}",
-                fg="red",
-            )
-            sys.exit(1)
-
-    click.secho(
-        "The provided credentials are not service account credentials. Please provide a valid service account credentials file or set valid service account credentials in the environment using GOOGLE_APPLICATION_CREDENTIALS.",
-        fg="red",
-    )
-    sys.exit(1)
-
-
 def get_origin_token(
     service_principal_name: str,
     deployment: str,
@@ -979,17 +932,6 @@ def configure(
     is_flag=True,
     help="Set if the command is being run in a GitHub Actions environment. If both --jwt-token and --github-actions are specified the --github-actions flag will be ignored.",
 )
-@click.option(
-    "--gcp",
-    is_flag=True,
-    help="Set if the command is being run which a Google Cloud service account credential. If both --jwt-token and --gcp are specified the -gcp flag will be ignored.",
-)
-@click.option(
-    "--gcp-service-account-toke-file-path",
-    default="",
-    help="The full path to the Google Cloud service account token file. If --gcp is set and this value is not specified, the default GOOGLE_APPLICATION_CREDENTIALS environment variable will be used.",
-    required=True,
-)
 @click.option(
     "-d",
     "--config-dir",
@@ -1021,31 +963,18 @@ def service_principal_configure(
     perimeter: str,
     jwt_token="",
     github_actions=False,
-    gcp=False,
-    gcp_service_account_toke_file_path="",
     config_dir=None,
     profile=None,
     echo=None,
     force=False,
 ):
     audience = f"https://{deployment_domain}"
-
-    # ensure only one of github_actions or gcp is set
-    if github_actions and gcp:
-        click.secho(
-            "Both --github-actions and --gcp flags cannot be set at the same time.",
-            fg="red",
-        )
-        sys.exit(1)
+    if jwt_token == "" and github_actions:
+        jwt_token = get_gha_jwt(audience)
 
     if jwt_token == "":
-        if github_actions:
-            jwt_token = get_gha_jwt(audience)
-        elif gcp:
-            jwt_token = get_gcp_jwt(audience, gcp_service_account_toke_file_path)
-    else:
         click.secho(
-            "No JWT token provided. Please provider either a valid jwt token or set --github-actions or --gcp flag.",
+            "No JWT token provided. Please provider either a valid jwt token or set --github-actions",
             fg="red",
         )
         sys.exit(1)

{outerbounds-0.3.93.dist-info → outerbounds-0.3.95.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: outerbounds
-Version: 0.3.93
+Version: 0.3.95
 Summary: More Data Science, Less Administration
 License: Proprietary
 Keywords: data science,machine learning,MLOps
@@ -24,9 +24,9 @@ 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-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: ob-metaflow (==2.12.17.1)
-Requires-Dist: ob-metaflow-extensions (==1.1.82)
-Requires-Dist: ob-metaflow-stubs (==5.5)
+Requires-Dist: ob-metaflow (==2.12.18.1)
+Requires-Dist: ob-metaflow-extensions (==1.1.83)
+Requires-Dist: ob-metaflow-stubs (==5.6)
 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.93.dist-info → outerbounds-0.3.95.dist-info}/RECORD

@@ -41,9 +41,9 @@ outerbounds/_vendor/yaml/serializer.py,sha256=8wFZRy9SsQSktF_f9OOroroqsh4qVUe53r
 outerbounds/_vendor/yaml/tokens.py,sha256=JBSu38wihGr4l73JwbfMA7Ks1-X84g8-NskTz7KwPmA,2578
 outerbounds/cli_main.py,sha256=e9UMnPysmc7gbrimq2I4KfltggyU7pw59Cn9aEguVcU,74
 outerbounds/command_groups/__init__.py,sha256=QPWtj5wDRTINDxVUL7XPqG3HoxHNvYOg08EnuSZB2Hc,21
-outerbounds/command_groups/apps_cli.py,sha256=k3zsBh7GupBqM5sbEU8OHSC1TBVdTBJybvPX4DX5Ack,20052
+outerbounds/command_groups/apps_cli.py,sha256=iXaLnO-FwU_zK2ZjE-gBu1ZQdOYDLCbT0HJXJJZckeE,21895
 outerbounds/command_groups/cli.py,sha256=q0hdJO4biD3iEOdyJcxnRkeleA8AKAhx842kQ49I6kk,365
-outerbounds/command_groups/local_setup_cli.py,sha256=AgK4fe-q1uRm20OsMGFGDezheGOPMBoESC98JT9HzqQ,39046
+outerbounds/command_groups/local_setup_cli.py,sha256=tuuqJRXQ_guEwOuQSIf9wkUU0yg8yAs31myGViAK15s,36364
 outerbounds/command_groups/perimeters_cli.py,sha256=mrJfFIRYFOjuiz-9h4OKg2JT8Utmbs72z6wvPzDss3s,18685
 outerbounds/command_groups/tutorials_cli.py,sha256=UInFyiMqtscHFfi8YQwiY_6Sdw9quJOtRu5OukEBccw,3522
 outerbounds/command_groups/workstations_cli.py,sha256=V5Jbj1cVb4IRllI7fOgNgL6OekRpuFDv6CEhDb4xC6w,22016
@@ -53,7 +53,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.93.dist-info/entry_points.txt,sha256=7ye0281PKlvqxu15rjw60zKg2pMsXI49_A8BmGqIqBw,47
-outerbounds-0.3.93.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-outerbounds-0.3.93.dist-info/METADATA,sha256=DbAq4c18up77upq4UVgOtzl1AL_cjHkdUC1SBHnx0os,1632
-outerbounds-0.3.93.dist-info/RECORD,,
+outerbounds-0.3.95.dist-info/entry_points.txt,sha256=7ye0281PKlvqxu15rjw60zKg2pMsXI49_A8BmGqIqBw,47
+outerbounds-0.3.95.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+outerbounds-0.3.95.dist-info/METADATA,sha256=3LLiN9Qy5q9P2ps9CMZO6C_5zi8eSTkxniYoRILxbxA,1632
+outerbounds-0.3.95.dist-info/RECORD,,