truss 0.9.44__tar.gz → 0.9.45.dev100__tar.gz

{truss-0.9.44 → truss-0.9.45.dev100}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: truss
-Version: 0.9.44
+Version: 0.9.45.dev100
 Summary: A seamless bridge from model development to model delivery
 Home-page: https://github.com/basetenlabs/truss
 License: MIT
@@ -17,6 +17,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: Jinja2 (>=3.1.2,<4.0.0)
 Requires-Dist: PyYAML (>=6.0)
+Requires-Dist: aiohttp (>=3.10.10,<4.0.0)
 Requires-Dist: blake3 (>=0.3.3,<0.4.0)
 Requires-Dist: boto3 (>=1.34.85,<2.0.0)
 Requires-Dist: fastapi (>=0.109.1)

{truss-0.9.44 → truss-0.9.45.dev100}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "truss"
-version = "0.9.44"
+version = "0.9.45dev100"
 description = "A seamless bridge from model development to model delivery"
 license = "MIT"
 readme = "README.md"
@@ -27,6 +27,7 @@ packages = [
 "Baseten" = "https://baseten.co"
 
 [tool.poetry.dependencies]
+aiohttp = "^3.10.10"
 blake3 = "^0.3.3"
 boto3 = "^1.34.85"
 fastapi = ">=0.109.1"

truss-0.9.45.dev100/truss/.pytest_cache/.gitignore

@@ -0,0 +1,2 @@
+# Created by pytest automatically.
+*

truss-0.9.45.dev100/truss/.pytest_cache/CACHEDIR.TAG

@@ -0,0 +1,4 @@
+Signature: 8a477f597d28d172789f06886806bc55
+# This file is a cache directory tag created by pytest.
+# For information about cache directory tags, see:
+#	https://bford.info/cachedir/spec.html

truss-0.9.45.dev100/truss/.pytest_cache/README.md

@@ -0,0 +1,8 @@
+# pytest cache directory #
+
+This directory contains data from the pytest's cache plugin,
+which provides the `--lf` and `--ff` options, as well as the `cache` fixture.
+
+**Do not** commit this to version control.
+
+See [the docs](https://docs.pytest.org/en/stable/how-to/cache.html) for more information.

truss-0.9.45.dev100/truss/.pytest_cache/v/cache/lastfailed

@@ -0,0 +1 @@
+{}

truss-0.9.45.dev100/truss/.pytest_cache/v/cache/nodeids

@@ -0,0 +1,3 @@
+[
+  "tests/test_control_truss_patching.py::test_patch_added_model_dir"
+]

truss-0.9.45.dev100/truss/.pytest_cache/v/cache/stepwise

@@ -0,0 +1 @@
+[]

{truss-0.9.44 → truss-0.9.45.dev100}/truss/cli/cli.py

@@ -410,7 +410,13 @@ def chains():
     """Subcommands for truss chains"""
 
 
-def _make_chains_curl_snippet(run_remote_url: str) -> str:
+def _make_chains_curl_snippet(run_remote_url: str, environment: Optional[str]) -> str:
+    if environment:
+        idx = run_remote_url.find("deployment")
+        if idx != -1:
+            run_remote_url = (
+                run_remote_url[:idx] + f"environments/{environment}/run_remote"
+            )
     return (
         f"curl -X POST '{run_remote_url}' \\\n"
         '    -H "Authorization: Api-Key $BASETEN_API_KEY" \\\n'
@@ -505,6 +511,15 @@ def _create_chains_table(service) -> Tuple[rich.table.Table, List[str]]:
     default=False,
     help="Replace production chainlets with newly deployed chainlets.",
 )
+@click.option(
+    "--environment",
+    type=str,
+    required=False,
+    help=(
+        "Deploy the chain as a published deployment to the specified environment."
+        "If specified, --publish is implied and the supplied value of --promote will be ignored."
+    ),
+)
 @click.option(
     "--wait/--no-wait",
     type=bool,
@@ -557,6 +572,7 @@ def push_chain(
     dryrun: bool,
     user_env: Optional[str],
     remote: Optional[str],
+    environment: Optional[str],
 ) -> None:
     """
     Deploys a chain remotely.
@@ -597,6 +613,10 @@ def push_chain(
     else:
         user_env_parsed = {}
 
+    if promote and environment:
+        promote_warning = "`promote` flag and `environment` flag were both specified. Ignoring the value of `promote`"
+        console.print(promote_warning, style="yellow")
+
     with framework.import_target(source, entrypoint) as entrypoint_cls:
         chain_name = name or entrypoint_cls.__name__
         options = chains_def.PushOptionsBaseten.create(
@@ -606,6 +626,7 @@ def push_chain(
             only_generate_trusses=dryrun,
             user_env=user_env_parsed,
             remote=remote,
+            environment=environment,
         )
         service = chains_remote.push(entrypoint_cls, options)
 
@@ -614,7 +635,9 @@ def push_chain(
         return
 
     assert isinstance(service, chains_remote.BasetenChainService)
-    curl_snippet = _make_chains_curl_snippet(service.run_remote_url)
+    curl_snippet = _make_chains_curl_snippet(
+        service.run_remote_url, options.environment
+    )
 
     table, statuses = _create_chains_table(service)
     status_check_wait_sec = 2
@@ -647,7 +670,10 @@ def push_chain(
             for log in intercepted_logs:
                 console.print(f"\t{log}")
         if success:
-            console.print("Deployment succeeded.", style="bold green")
+            deploy_success_text = "Deployment succeeded."
+            if environment:
+                deploy_success_text = f"Your chain has been deployed into the {options.environment} environment."
+            console.print(deploy_success_text, style="bold green")
             console.print(f"You can run the chain with:\n{curl_snippet}")
             if watch:  # Note that this command will print a startup message.
                 chains_remote.watch(

{truss-0.9.44 → truss-0.9.45.dev100}/truss/remote/baseten/api.py

@@ -235,7 +235,10 @@ class BasetenApi:
         return resp["data"]["deploy_draft_chain"]
 
     def deploy_chain_deployment(
-        self, chain_id: str, chainlet_data: List[b10_types.ChainletData], promote: bool
+        self,
+        chain_id: str,
+        chainlet_data: List[b10_types.ChainletData],
+        environment: Optional[str] = None,
     ):
         chainlet_data_strings = [
             _chainlet_data_to_graphql_mutation(chainlet) for chainlet in chainlet_data
@@ -243,14 +246,14 @@ class BasetenApi:
         chainlets_string = ", ".join(chainlet_data_strings)
         query_string = f"""
         mutation {{
-        deploy_chain_deployment(
-            chain_id: "{chain_id}",
-            chainlets: [{chainlets_string}],
-            promote_after_deploy: {'true' if promote else 'false'},
-        ) {{
-            chain_id
-            chain_deployment_id
-        }}
+            deploy_chain_deployment(
+                chain_id: "{chain_id}",
+                chainlets: [{chainlets_string}],
+                {f'environment_name: "{environment}"' if environment else ""}
+            ) {{
+                chain_id
+                chain_deployment_id
+            }}
         }}
         """
         resp = self._post_graphql_query(query_string)

{truss-0.9.44 → truss-0.9.45.dev100}/truss/remote/baseten/core.py

@@ -84,7 +84,7 @@ def create_chain(
     chain_name: str,
     chainlets: List[b10_types.ChainletData],
     is_draft: bool,
-    promote: bool,
+    environment: Optional[str],
 ) -> ChainDeploymentHandle:
     if is_draft:
         response = api.deploy_draft_chain(chain_name, chainlets)
@@ -93,8 +93,20 @@ def create_chain(
         # if there is no chain already, the first deployment will
         # already be production, and only published deployments can
         # be promoted.
-        response = api.deploy_chain_deployment(chain_id, chainlets, promote)
+        try:
+            response = api.deploy_chain_deployment(chain_id, chainlets, environment)
+        except ApiError as e:
+            if (
+                e.graphql_error_code
+                == BasetenApi.GraphQLErrorCodes.RESOURCE_NOT_FOUND.value
+            ):
+                raise ValueError(
+                    f'Environment "{environment}" does not exist. You can create environments in the Chains UI.'
+                ) from e
+            raise e
     else:
+        if environment and environment != PRODUCTION_ENVIRONMENT_NAME:
+            raise ValueError(NO_ENVIRONMENTS_EXIST_ERROR_MESSAGING)
         response = api.deploy_chain(chain_name, chainlets)
 
     return ChainDeploymentHandle(
@@ -299,7 +311,10 @@ def create_truss_service(
             environment=environment,
         )
     except ApiError as e:
-        if "Environment matching query does not exist" in e.message:
+        if (
+            e.graphql_error_code
+            == BasetenApi.GraphQLErrorCodes.RESOURCE_NOT_FOUND.value
+        ):
             raise ValueError(
                 f'Environment "{environment}" does not exist. You can create environments in the Baseten UI.'
             ) from e

{truss-0.9.44 → truss-0.9.45.dev100}/truss/remote/baseten/remote.py

@@ -67,10 +67,10 @@ class BasetenRemote(TrussRemote):
         chain_name: str,
         chainlets: List[custom_types.ChainletData],
         publish: bool = False,
-        promote: bool = False,
+        environment: Optional[str] = None,
     ) -> ChainDeploymentHandle:
-        if promote:
-            # If we are promoting a model after deploy, it must be published.
+        if environment:
+            # If we are promoting a model to an environment after deploy, it must be published.
             # Draft models cannot be promoted.
             publish = True
         # Returns tuple of (chain_id, chain_deployment_id)
@@ -81,7 +81,7 @@ class BasetenRemote(TrussRemote):
             chain_name=chain_name,
             chainlets=chainlets,
             is_draft=not publish,
-            promote=promote,
+            environment=environment,
         )
 
     def get_chainlets(

{truss-0.9.44 → truss-0.9.45.dev100}/truss/templates/server.Dockerfile.jinja

@@ -105,7 +105,7 @@ COPY ./proxy.conf {{ proxy_config_path }}
 RUN mkdir -p {{ supervisor_log_dir }}
 COPY supervisord.conf {{ supervisor_config_path }}
 ENV SUPERVISOR_SERVER_URL="{{ supervisor_server_url }}"
-ENV SERVER_START_CMD="/usr/local/bin/supervisord -c {{ supervisor_config_path }}"
+ENV SERVER_START_CMD="supervisord -c {{ supervisor_config_path }}"
 ENTRYPOINT ["/usr/local/bin/supervisord", "-c", "{{ supervisor_config_path }}"]
     {%- elif config.live_reload %}
 ENV HASH_TRUSS="{{truss_hash}}"

truss-0.9.45.dev100/truss/test_data/test_basic_truss/packages2/package1/foo.py

@@ -0,0 +1,2 @@
+def bar():
+    print("in bar")

truss-0.9.45.dev100/truss/test_data/test_basic_truss/sidscript.py

@@ -0,0 +1,8 @@
+import os
+
+print("HI SID")
+
+print("Hi agaisdfn")
+print("more content")
+
+raise Exception("Foo")