truss 0.10.9rc538__py3-none-any.whl → 0.10.10__py3-none-any.whl

truss/cli/train_commands.py

@@ -73,8 +73,11 @@ def _prepare_click_context(f: click.Command, params: dict) -> click.Context:
 @click.argument("config", type=Path, required=True)
 @click.option("--remote", type=str, required=False, help="Remote to use")
 @click.option("--tail", is_flag=True, help="Tail for status + logs after push.")
+@click.option("--job-name", type=str, required=False, help="Name of the training job.")
 @common.common_options()
-def push_training_job(config: Path, remote: Optional[str], tail: bool):
+def push_training_job(
+    config: Path, remote: Optional[str], tail: bool, job_name: Optional[str]
+):
     """Run a training job"""
     from truss_train import deployment
 
@@ -85,7 +88,9 @@ def push_training_job(config: Path, remote: Optional[str], tail: bool):
         remote_provider: BasetenRemote = cast(
             BasetenRemote, RemoteFactory.create(remote=remote)
         )
-        job_resp = deployment.create_training_job_from_file(remote_provider, config)
+        job_resp = deployment.create_training_job_from_file(
+            remote_provider, config, job_name
+        )
 
     # Note: This post create logic needs to happen outside the context
     # of the above context manager, as only one console session can be active

truss/contexts/image_builder/serving_image_builder.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import os
 import json
 import logging
 import re
@@ -74,7 +73,6 @@ from truss.contexts.image_builder.util import (
 )
 from truss.contexts.truss_context import TrussContext
 from truss.truss_handle.patch.hash import directory_content_hash
-from truss.util.basetenpointer import model_cache_hf_to_b10ptr
 from truss.util.jinja import read_template_from_fs
 from truss.util.path import (
     build_truss_target_directory,
@@ -327,36 +325,27 @@ def get_files_to_model_cache_v1(config: TrussConfig, truss_dir: Path, build_dir:
 def build_model_cache_v2_and_copy_bptr_manifest(config: TrussConfig, build_dir: Path):
     assert config.model_cache.is_v2
     assert all(model.volume_folder is not None for model in config.model_cache.models)
-    try:
-        from truss_transfer import PyModelRepo, create_basetenpointer_from_models
-
-        py_models = [
-            PyModelRepo(
-                repo_id=model.repo_id,
-                revision=model.revision,
-                runtime_secret_name=model.runtime_secret_name,
-                allow_patterns=model.allow_patterns,
-                ignore_patterns=model.ignore_patterns,
-                volume_folder=model.volume_folder,
-                kind=model.kind.value,
-            )
-            for model in config.model_cache.models
-        ]
-        # create BasetenPointer from models
-        basetenpointer_json = create_basetenpointer_from_models(models=py_models)
-        bptr_py = json.loads(basetenpointer_json)["pointers"]
-        logging.info(f"created ({len(bptr_py)}) Basetenpointer")
-        logging.info(f"pointers json: {basetenpointer_json}")
-        with open(build_dir / "bptr-manifest", "w") as f:
-            f.write(basetenpointer_json)
-    except Exception as e:
-        logging.warning(f"debug: failed to create BasetenPointer: {e}")
-        # TODO: remove below section + remove logging lines above.
-        # builds BasetenManifest for caching
-        basetenpointers = model_cache_hf_to_b10ptr(config.model_cache)
-        # write json of bastenpointers into build dir
-        with open(build_dir / "bptr-manifest", "w") as f:
-            f.write(basetenpointers.model_dump_json())
+    from truss_transfer import PyModelRepo, create_basetenpointer_from_models
+
+    py_models = [
+        PyModelRepo(
+            repo_id=model.repo_id,
+            revision=model.revision,
+            runtime_secret_name=model.runtime_secret_name,
+            allow_patterns=model.allow_patterns,
+            ignore_patterns=model.ignore_patterns,
+            volume_folder=model.volume_folder,
+            kind=model.kind.value,
+        )
+        for model in config.model_cache.models
+    ]
+    # create BasetenPointer from models
+    basetenpointer_json = create_basetenpointer_from_models(models=py_models)
+    bptr_py = json.loads(basetenpointer_json)["pointers"]
+    logging.info(f"created ({len(bptr_py)}) Basetenpointer")
+    logging.info(f"pointers json: {basetenpointer_json}")
+    with open(build_dir / "bptr-manifest", "w") as f:
+        f.write(basetenpointer_json)
 
 
 def generate_docker_server_nginx_config(build_dir, config):
@@ -794,8 +783,6 @@ class ServingImageBuilder(ImageBuilder):
             config
         )
 
-        non_root_user = os.getenv("BT_USE_NON_ROOT_USER", False)
-        enable_model_container_admin_commands = os.getenv("BT_ENABLE_MODEL_CONTAINER_ADMIN_CMDS")
         dockerfile_contents = dockerfile_template.render(
             should_install_server_requirements=should_install_server_requirements,
             base_image_name_and_tag=base_image_name_and_tag,
@@ -829,8 +816,6 @@ class ServingImageBuilder(ImageBuilder):
             build_commands=build_commands,
             use_local_src=config.use_local_src,
             passthrough_environment_variables=passthrough_environment_variables,
-            non_root_user=non_root_user,
-            enable_model_container_admin_commands=enable_model_container_admin_commands,
             **FILENAME_CONSTANTS_MAP,
         )
         # Consolidate repeated empty lines to single empty lines.

truss/templates/base.Dockerfile.jinja

@@ -8,32 +8,6 @@ FROM {{ base_image_name_and_tag }} AS truss_server
 {%- set python_executable = config.base_image.python_executable_path or 'python3' %}
 ENV PYTHON_EXECUTABLE="{{ python_executable }}"
 
-{%- set app_username = "app" %}  {# needed later for USER directive#}
-{% block user_setup %}
-{%- set app_user_uid = 60000 %}
-{%- set control_server_dir = "/control" %}
-{%- set default_owner = "root:root" %}
-# The non-root user's home directory.
-# uv will use $HOME to install packages.
-ENV HOME=/home/{{ app_username }}
-# Directory containing inference server code.
-ENV APP_HOME=/{{ app_username }}
-RUN mkdir -p ${APP_HOME} {{ control_server_dir }}
-# Create a non-root user to run model containers.
-RUN useradd -u {{ app_user_uid }} -ms /bin/bash {{ app_username }}
-# Add the user's local bin to the path, used by uv.
-ENV PATH=${PATH}:${HOME}/.local/bin
-{% endblock %} {#- endblock user_setup #}
-
-{%- if enable_model_container_admin_commands %}
-RUN apt update && apt install -y sudo
-{%- set allowed_admin_commands = ["/usr/bin/apt install *", "/usr/bin/apt update"] %}
-RUN echo "Defaults:{{ app_username }} passwd_tries=0\n{{ app_username }} ALL=(root) NOPASSWD: {{ allowed_admin_commands | join(", ") }}" > /etc/sudoers.d/app-packages
-RUN chmod 0440 /etc/sudoers.d/app-packages
-{#- optional but good practice: check if the sudoers file is valid #}
-RUN visudo -c
-{%- endif %}
-
 {%- set UV_VERSION = "0.7.19" %}
 {#
 NB(nikhil): We use a semi-complex uv installation command across the board:
@@ -65,6 +39,7 @@ RUN if ! command -v uv >/dev/null 2>&1; then \
     command -v curl >/dev/null 2>&1 || (apt update && apt install -y curl) && \
     curl -LsSf --retry 5 --retry-delay 5 https://astral.sh/uv/{{ UV_VERSION }}/install.sh | sh; \
 fi
+ENV PATH="/root/.local/bin:$PATH"
 {% endblock %}
 
 {% block base_image_patch %}
@@ -82,7 +57,7 @@ RUN {{ sys_pip_install_command }} install mkl
 
 {% block install_system_requirements %}
     {%- if should_install_system_requirements %}
-COPY --chown={{ default_owner }} ./{{ system_packages_filename }} {{ system_packages_filename }}
+COPY ./{{ system_packages_filename }} {{ system_packages_filename }}
 RUN apt-get update && apt-get install --yes --no-install-recommends $(cat {{ system_packages_filename }}) \
     && apt-get autoremove -y \
     && apt-get clean -y \
@@ -93,11 +68,11 @@ RUN apt-get update && apt-get install --yes --no-install-recommends $(cat {{ sys
 
 {% block install_requirements %}
     {%- if should_install_user_requirements_file %}
-COPY --chown={{ default_owner }} ./{{ user_supplied_requirements_filename }} {{ user_supplied_requirements_filename }}
+COPY ./{{ user_supplied_requirements_filename }} {{ user_supplied_requirements_filename }}
 RUN {{ sys_pip_install_command }} -r {{ user_supplied_requirements_filename }} --no-cache-dir
     {%- endif %}
     {%- if should_install_requirements %}
-COPY --chown={{ default_owner }} ./{{ config_requirements_filename }} {{ config_requirements_filename }}
+COPY ./{{ config_requirements_filename }} {{ config_requirements_filename }}
 RUN {{ sys_pip_install_command }} -r {{ config_requirements_filename }} --no-cache-dir
 {%- endif %}
 {% endblock %}
@@ -105,6 +80,7 @@ RUN {{ sys_pip_install_command }} -r {{ config_requirements_filename }} --no-cac
 
 
 {%- if not config.docker_server %}
+ENV APP_HOME="/app"
 WORKDIR $APP_HOME
 {%- endif %}
 
@@ -114,7 +90,7 @@ WORKDIR $APP_HOME
 
 {% block bundled_packages_copy %}
     {%- if bundled_packages_dir_exists %}
-COPY --chown={{ default_owner }} ./{{ config.bundled_packages_dir }} /packages
+COPY ./{{ config.bundled_packages_dir }} /packages
 {%- endif %}
 {% endblock %}
 

truss/templates/cache.Dockerfile.jinja

@@ -1,7 +1,7 @@
 FROM python:3.11-slim AS cache_warmer
 
-RUN mkdir -p ${APP_HOME}/model_cache
-WORKDIR ${APP_HOME}
+RUN mkdir -p /app/model_cache
+WORKDIR /app
 
 {% if hf_access_token %}
 ENV HUGGING_FACE_HUB_TOKEN="{{hf_access_token}}"
@@ -9,12 +9,12 @@ ENV HUGGING_FACE_HUB_TOKEN="{{hf_access_token}}"
 
 RUN apt-get -y update; apt-get -y install curl; curl -s https://baseten-public.s3.us-west-2.amazonaws.com/bin/b10cp-5fe8dc7da-linux-amd64 -o /app/b10cp; chmod +x /app/b10cp
 ENV B10CP_PATH_TRUSS="/app/b10cp"
-COPY --chown={{ default_owner }} ./cache_requirements.txt ${APP_HOME}/cache_requirements.txt
+COPY ./cache_requirements.txt /app/cache_requirements.txt
 RUN pip install -r /app/cache_requirements.txt --no-cache-dir && rm -rf /root/.cache/pip
-COPY --chown={{ default_owner }} ./cache_warmer.py /cache_warmer.py
+COPY ./cache_warmer.py /cache_warmer.py
 
 {% for credential in credentials_to_cache  %}
-COPY ./{{credential}} ${APP_HOME}/{{credential}}
+COPY ./{{credential}} /app/{{credential}}
 {% endfor %}
 
 {% for repo, hf_dir in models.items() %}

truss/templates/copy_cache_files.Dockerfile.jinja

@@ -1,3 +1,3 @@
 {% for file in cached_files %}
-COPY --chown={{ default_owner }} --from=cache_warmer {{file.source}} {{file.dst}}
+COPY --from=cache_warmer {{file.source}} {{file.dst}}
 {% endfor %}

truss/templates/docker_server/supervisord.conf.jinja

@@ -1,5 +1,4 @@
 [supervisord]
-pidfile=/tmp/supervisord.pid ; Set PID file location to /tmp to be writable by the non-root user
 nodaemon=true                ; Run supervisord in the foreground (useful for containers)
 logfile=/dev/null            ; Disable logging to file (send logs to /dev/null)
 logfile_maxbytes=0           ; No size limit on logfile (since logging is disabled)

truss/templates/server/requirements.txt

@@ -18,7 +18,7 @@ psutil>=5.9.4
 python-json-logger>=2.0.2
 pyyaml>=6.0.0
 requests>=2.31.0
-truss-transfer==0.0.27
+truss-transfer==0.0.29
 uvicorn>=0.24.0
 uvloop>=0.19.0
 websockets>=10.0

truss/templates/server.Dockerfile.jinja

@@ -20,7 +20,7 @@ RUN apt update && \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
 
-COPY --chown={{ default_owner }} ./{{ base_server_requirements_filename }} {{ base_server_requirements_filename }}
+COPY ./{{ base_server_requirements_filename }} {{ base_server_requirements_filename }}
 RUN {{ sys_pip_install_command }} -r {{ base_server_requirements_filename }} --no-cache-dir
     {%- endif %} {#- endif not config.docker_server #}
 
@@ -38,7 +38,7 @@ RUN ln -sf {{ config.base_image.python_executable_path }} /usr/local/bin/python
 
 {% block install_requirements %}
     {%- if should_install_server_requirements %}
-COPY --chown={{ default_owner }} ./{{ server_requirements_filename }} {{ server_requirements_filename }}
+COPY ./{{ server_requirements_filename }} {{ server_requirements_filename }}
 RUN {{ sys_pip_install_command }} -r {{ server_requirements_filename }} --no-cache-dir
     {%- endif %} {#- endif should_install_server_requirements #}
 {{ super() }}
@@ -65,47 +65,47 @@ RUN {% for secret,path in config.build.secret_to_path_mapping.items() %} --mount
 
 {# Copy data before code for better caching #}
 {%- if data_dir_exists %}
-COPY --chown={{ default_owner }} ./{{ config.data_dir }} ${APP_HOME}/data
+COPY ./{{ config.data_dir }} /app/data
 {%- endif %} {#- endif data_dir_exists #}
 
 {%- if model_cache_v2 %}
 # v0.0.9, keep synced with server_requirements.txt
-RUN curl -sSL --fail --retry 5 --retry-delay 2 -o /usr/local/bin/truss-transfer-cli https://github.com/basetenlabs/truss/releases/download/v0.10.9rc0/truss-transfer-cli-v0.10.9rc0-linux-x86_64-unknown-linux-musl
+RUN curl -sSL --fail --retry 5 --retry-delay 2 -o /usr/local/bin/truss-transfer-cli https://github.com/basetenlabs/truss/releases/download/v0.10.10rc1/truss-transfer-cli-v0.10.10rc1-linux-x86_64-unknown-linux-musl
 RUN chmod +x /usr/local/bin/truss-transfer-cli
 RUN mkdir /static-bptr
 RUN echo "hash {{model_cache_hash}}"
-COPY --chown={{ default_owner }} ./bptr-manifest /static-bptr/static-bptr-manifest.json
+COPY ./bptr-manifest /static-bptr/static-bptr-manifest.json
 {%- endif %} {#- endif model_cache_v2 #}
 
 {%- if not config.docker_server %}
-COPY --chown={{ default_owner }} ./server ${APP_HOME}
+COPY ./server /app
 {%- endif %} {#- endif not config.docker_server #}
 
 {%- if use_local_src %}
 {# This path takes precedence over site-packages. #}
-COPY --chown={{ default_owner }} ./truss_chains ${APP_HOME}/truss_chains
-COPY --chown={{ default_owner }} ./truss ${APP_HOME}/truss
+COPY ./truss_chains /app/truss_chains
+COPY ./truss /app/truss
 {%- endif %} {#- endif use_local_src #}
 
-COPY --chown={{ default_owner }} ./config.yaml ${APP_HOME}/config.yaml
+COPY ./config.yaml /app/config.yaml
 {%- if requires_live_reload %}
 RUN uv python install {{ control_python_version }}
 RUN uv venv /control/.env --python {{ control_python_version }}
 
-COPY --chown={{ default_owner }} ./control /control
+COPY ./control /control
 RUN uv pip install -r /control/requirements.txt --python /control/.env/bin/python --no-cache-dir
 {%- endif %} {#- endif requires_live_reload #}
 
 {%- if model_dir_exists %}
-COPY --chown={{ default_owner }} ./{{ config.model_module_dir }} ${APP_HOME}/model
+COPY ./{{ config.model_module_dir }} /app/model
 {%- endif %} {#- endif model_dir_exists #}
 {% endblock %} {#- endblock app_copy #}
 
 {% block run %}
     {%- if config.docker_server %}
-RUN apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         curl nginx && rm -rf /var/lib/apt/lists/*
-COPY --chown={{ default_owner }} ./docker_server_requirements.txt ${APP_HOME}/docker_server_requirements.txt
+COPY ./docker_server_requirements.txt /app/docker_server_requirements.txt
 
 {# NB(nikhil): Use the same python version for custom server proxy as the control server, for consistency. #}
 RUN uv python install {{ control_python_version }}
@@ -115,38 +115,21 @@ RUN uv pip install --python /docker_server/.venv/bin/python -r /app/docker_serve
 {% set supervisor_config_path = "/etc/supervisor/supervisord.conf" %}
 {% set supervisor_log_dir = "/var/log/supervisor" %}
 {% set supervisor_server_url = "http://localhost:8080" %}
-COPY --chown={{ default_owner }} ./proxy.conf {{ proxy_config_path }}
+COPY ./proxy.conf {{ proxy_config_path }}
 RUN mkdir -p {{ supervisor_log_dir }}
-COPY --chown={{ default_owner }} ./supervisord.conf {{ supervisor_config_path }}
+COPY supervisord.conf {{ supervisor_config_path }}
 ENV SUPERVISOR_SERVER_URL="{{ supervisor_server_url }}"
 ENV SERVER_START_CMD="/docker_server/.venv/bin/supervisord -c {{ supervisor_config_path }}"
-{#- default configuration uses port 80, which requires root privileges, so we remove it #}
-RUN rm -f /etc/nginx/sites-enabled/default
-{%- if non_root_user %}
-{#- nginx writes to /var/lib/nginx, /var/log/nginx, and /run directories #}
-{% set nginx_dirs = ["/var/lib/nginx", "/var/log/nginx", "/run"] %}
-RUN chown -R {{ app_username }}:{{ app_username }} {{ nginx_dirs | join(" ") }}
-RUN chown -R {{ app_username }}:{{ app_username }} ${HOME} ${APP_HOME}
-USER {{ app_username }}
-{%- endif %} {#- endif non_root_user #}
 ENTRYPOINT ["/docker_server/.venv/bin/supervisord", "-c", "{{ supervisor_config_path }}"]
     {%- elif requires_live_reload %} {#- elif requires_live_reload #}
 ENV HASH_TRUSS="{{ truss_hash }}"
 ENV CONTROL_SERVER_PORT="8080"
 ENV INFERENCE_SERVER_PORT="8090"
 ENV SERVER_START_CMD="/control/.env/bin/python /control/control/server.py"
-{%- if non_root_user %}
-RUN chown -R {{ app_username }}:{{ app_username }} ${HOME} ${APP_HOME}
-USER {{ app_username }}
-{%- endif %} {#- endif non_root_user #}
 ENTRYPOINT ["/control/.env/bin/python", "/control/control/server.py"]
     {%- else %} {#- else (default inference server) #}
 ENV INFERENCE_SERVER_PORT="8080"
 ENV SERVER_START_CMD="{{ python_executable }} /app/main.py"
-{%- if non_root_user %}
-RUN chown -R {{ app_username }}:{{ app_username }} ${HOME} ${APP_HOME}
-USER {{ app_username }}
-{%- endif %} {#- endif non_root_user #}
 ENTRYPOINT ["{{ python_executable }}", "/app/main.py"]
     {%- endif %} {#- endif config.docker_server / live_reload #}
 {% endblock %} {#- endblock run #}

{truss-0.10.9rc538.dist-info → truss-0.10.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.10.9rc538
+Version: 0.10.10
 Summary: A seamless bridge from model development to model delivery
 Project-URL: Repository, https://github.com/basetenlabs/truss
 Project-URL: Homepage, https://truss.baseten.co
@@ -37,7 +37,7 @@ Requires-Dist: rich<14,>=13.4.2
 Requires-Dist: ruff>=0.4.8
 Requires-Dist: tenacity>=8.0.1
 Requires-Dist: tomlkit>=0.13.2
-Requires-Dist: truss-transfer==0.0.27
+Requires-Dist: truss-transfer==0.0.29
 Requires-Dist: watchfiles<0.20,>=0.19.0
 Description-Content-Type: text/markdown
 

{truss-0.10.9rc538.dist-info → truss-0.10.10.dist-info}/RECORD

@@ -11,7 +11,7 @@ truss/base/truss_spec.py,sha256=jFVF79CXoEEspl2kXBAPyi-rwISReIGTdobGpaIhwJw,5979
 truss/cli/chains_commands.py,sha256=y6pdIAGCcKOPG9bPuCXPfSA0onQm5x-tT_3blSBfPYg,16971
 truss/cli/cli.py,sha256=PaMkuwXZflkU7sa1tEoT_Zmy-iBkEZs1m4IVqcieaeo,30367
 truss/cli/remote_cli.py,sha256=G_xCKRXzgkCmkiZJhUFfsv5YSVgde1jLA5LPQitpZgI,1905
-truss/cli/train_commands.py,sha256=u8FhhA4r9j6smIr0bfvPbnBOJyd6sCqyEemsWXfcwWs,12193
+truss/cli/train_commands.py,sha256=P9bdnpq1SgEGXBaVf9joKdsaCDX2v29P4MhLMuz-jYw,12344
 truss/cli/logs/base_watcher.py,sha256=KKyd7lIrdaEeDVt8EtjMioSPGVpLyOcF0ewyzE_GGdQ,2785
 truss/cli/logs/model_log_watcher.py,sha256=NACcP-wkcaroYa2Cb9BZC7Yr0554WZa_FSM2LXOf4A8,1263
 truss/cli/logs/training_log_watcher.py,sha256=r6HRqrLnz-PiKTUXiDYYxg4ZnP8vYcXlEX1YmgHhzlo,1173
@@ -36,7 +36,7 @@ truss/contexts/docker_build_setup.py,sha256=cF4ExZgtYvrWxvyCAaUZUvV_DB_7__MqVomU
 truss/contexts/truss_context.py,sha256=uS6L-ACHxNk0BsJwESOHh1lA0OGGw0pb33aFKGsASj4,436
 truss/contexts/image_builder/cache_warmer.py,sha256=TGMV1Mh87n2e_dSowH0sf0rZhZraDOR-LVapZL3a5r8,7377
 truss/contexts/image_builder/image_builder.py,sha256=IuRgDeeoHVLzIkJvKtX3807eeqEyaroCs_KWDcIHZUg,1461
-truss/contexts/image_builder/serving_image_builder.py,sha256=yrFBAGmYspt_4rtdrku-zeKQfEkqfHfTzIJEkDNDkng,34226
+truss/contexts/image_builder/serving_image_builder.py,sha256=FH5HPnrr9_OomN5WplsyUrGGETe9ld6h3q9JCpvB6FY,33322
 truss/contexts/image_builder/util.py,sha256=y2-CjUKv0XV-0w2sr1fUCflysDJLsoU4oPp6tvvoFnk,1203
 truss/contexts/local_loader/docker_build_emulator.py,sha256=rmf7I28zksSmHjwvJMx2rIa6xK4KeR5fBm5YFth_fQg,2464
 truss/contexts/local_loader/dockerfile_parser.py,sha256=GoRJ0Af_3ILyLhjovK5lrCGn1rMxz6W3l681ro17ZzI,1344
@@ -66,12 +66,12 @@ truss/remote/baseten/utils/time.py,sha256=Ry9GMjYnbIGYVIGwtmv4V8ljWjvdcaCf5NOQzl
 truss/remote/baseten/utils/transfer.py,sha256=d3VptuQb6M1nyS6kz0BAfeOYDLkMKUjatJXpY-mp-As,1548
 truss/templates/README.md.jinja,sha256=N7CJdyldZuJamj5jLh47le0hFBdu9irVsTBqoxhPNPQ,2476
 truss/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truss/templates/base.Dockerfile.jinja,sha256=7EjUj08Wy0OmG0euDnwi-MFEYYiizcTIeNeDRVyMyhk,5255
-truss/templates/cache.Dockerfile.jinja,sha256=evMbbMXjceDjUmGGuB0shLS_PxZsc9ZGkbzR-6aIW-Q,1114
+truss/templates/base.Dockerfile.jinja,sha256=vFAJH1lC9jg90-076H2DCmkXUAlpseitIN6c4UwagxA,4020
+truss/templates/cache.Dockerfile.jinja,sha256=LhsVP9F3BATKQGkgya_YT4v6ABTUkpy-Jb3N36zsw10,1030
 truss/templates/cache_requirements.txt,sha256=xoPoJ-OVnf1z6oq_RVM3vCr3ionByyqMLj7wGs61nUs,87
-truss/templates/copy_cache_files.Dockerfile.jinja,sha256=Os5zFdYLZ_AfCRGq4RcpVTObOTwL7zvmwYcvOzd_Zqo,126
+truss/templates/copy_cache_files.Dockerfile.jinja,sha256=arHldnuclt7vUFHyRz6vus5NGMDkIofm-1RU37A0xZM,98
 truss/templates/docker_server_requirements.txt,sha256=PyhOPKAmKW1N2vLvTfLMwsEtuGpoRrbWuNo7tT6v2Mc,18
-truss/templates/server.Dockerfile.jinja,sha256=qGhUrii-WrM3dnE-5QGE4NYSvT93mG_lYXOPFeB7xpc,7247
+truss/templates/server.Dockerfile.jinja,sha256=Ts4kty2ZXTJS69XkNHTNHtEyr8yf8VwNQgBBLY89chk,5996
 truss/templates/control/requirements.txt,sha256=Kk0tYID7trPk5gwX38Wrt2-YGWZAXFJCJRcqJ8ZzCjc,251
 truss/templates/control/control/application.py,sha256=jYeta6hWe1SkfLL3W4IDmdYjg3ZuKqI_UagWYs5RB_E,3793
 truss/templates/control/control/endpoints.py,sha256=FM-sgao7I3gMoUTasM3Xq_g2LDoJQe75JxIoaQxzeNo,10031
@@ -92,11 +92,11 @@ truss/templates/custom/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 truss/templates/custom/model/model.py,sha256=J04rLxK09Pwt2F4GoKOLKL-H-CqZUdYIM-PL2CE9PoE,1079
 truss/templates/custom_python_dx/my_model.py,sha256=NG75mQ6wxzB1BYUemDFZvRLBET-UrzuUK4FuHjqI29U,910
 truss/templates/docker_server/proxy.conf.jinja,sha256=Lg-PcZzKflG85exZKHNgW_I6r0mATV8AtOIBaE40-RM,1669
-truss/templates/docker_server/supervisord.conf.jinja,sha256=dd37fwZE--cutrvOUCqEyJQQQhlp61H2IUs2huKWsSk,1808
+truss/templates/docker_server/supervisord.conf.jinja,sha256=CoaSLv0Lr8t1tS_q102IFufNX2lWrlbCHJLjMhYjOwM,1711
 truss/templates/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truss/templates/server/main.py,sha256=kWXrdD8z8IpamyWxc8qcvd5ck9gM1Kz2QH5qHJCnmOQ,222
 truss/templates/server/model_wrapper.py,sha256=k75VVISwwlsx5EGb82UZsu8kCM_i6Yi3-Hd0-Kpm1yo,42055
-truss/templates/server/requirements.txt,sha256=iRR2BEpBQnt-YOiTEKOnaab7tlR4C23V1cuURuIt7ZY,672
+truss/templates/server/requirements.txt,sha256=Xvf7mT4zjK1B6rIrNW80-An03yCNCXvWiB6OvWrhIxg,672
 truss/templates/server/truss_server.py,sha256=ob_nceeGtFPZzKKdk_ZZGLoZrJOGE6hR52xM1sPR97A,19498
 truss/templates/server/common/__init__.py,sha256=qHIqr68L5Tn4mV6S-PbORpcuJ4jmtBR8aCuRTIWDvNo,85
 truss/templates/server/common/errors.py,sha256=qWeZlmNI8ZGbZbOIp_mtS6IKvUFIzhj3QH8zp-xTp9o,8554
@@ -309,7 +309,6 @@ truss/tests/test_data/test_truss_with_error/packages/helpers_1.py,sha256=qIm-hQY
 truss/tests/test_data/test_truss_with_error/packages/helpers_2.py,sha256=q_UpVfXq_K2tuHv6YwsIzVHC3sy5k5hKDw6lMCdS0oc,53
 truss/tests/trt_llm/test_trt_llm_config.py,sha256=lNQ4EEkOsiT17KvnvW1snCeEBd7K_cl9_Y0dko3qpn8,8505
 truss/tests/trt_llm/test_validation.py,sha256=dmax2EHxRfqxJvWzV8uubkTef50833KBBHw-WkHufL8,2120
-truss/tests/util/test_basetenpointer.py,sha256=Bdms21_m8T4xmFNHRO5nS2tU2wU7094_1SkfBxjptmk,9824
 truss/tests/util/test_config_checks.py,sha256=aoZF_Q-eRd3qz5wjUqa8Cr_7qF2SxodXbBIY_DBuFWg,522
 truss/tests/util/test_env_vars.py,sha256=hthgB1mU0bJb1H4Jugc-0khArlLZ3x6tLE82cDaa-J0,390
 truss/tests/util/test_path.py,sha256=YfW3-IM_7iRsdR1Cb26KB1BkDsG_53_BUGBzoxY2Nog,7408
@@ -331,7 +330,6 @@ truss/truss_handle/patch/local_truss_patch_applier.py,sha256=fOHWKt3teYnbqeRsF63
 truss/truss_handle/patch/signature.py,sha256=8eas8gy6Japd1hrgdmtHmKTTxQmWsbmgKRQQGL2PVuA,858
 truss/truss_handle/patch/truss_dir_patch_applier.py,sha256=uhhHvKYHn_dpfz0xp4jwO9_qAej5sO3f8of_h-21PP4,3666
 truss/util/.truss_ignore,sha256=jpQA9ou-r_JEIcEHsUqGLHhir_m3d4IPGNyzKXtS-2g,3131
-truss/util/basetenpointer.py,sha256=PJ_meuTuXAopnWsHe1ZaH2RnltfmqdQ4QeXDQEPrblI,5596
 truss/util/docker.py,sha256=6PD7kMBBrOjsdvgkuSv7JMgZbe3NoJIeGasljMm2SwA,3934
 truss/util/download.py,sha256=1lfBwzyaNLEp7SAVrBd9BX5inZpkCVp8sBnS9RNoiJA,2521
 truss/util/env_vars.py,sha256=7Bv686eER71Barrs6fNamk_TrTJGmu9yV2TxaVmupn0,1232
@@ -361,12 +359,12 @@ truss_chains/remote_chainlet/model_skeleton.py,sha256=8ZReLOO2MLcdg7bNZ61C-6j-e6
 truss_chains/remote_chainlet/stub.py,sha256=Y2gDUzMY9WRaQNHIz-o4dfLUfFyYV9dUhIRQcfgrY8g,17209
 truss_chains/remote_chainlet/utils.py,sha256=O_5P-VAUvg0cegEW1uKCOf5EBwD8rEGYVoGMivOmc7k,22374
 truss_train/__init__.py,sha256=7hE6j6-u6UGzCGaNp3CsCN0kAVjBus1Ekups-Bk0fi4,837
-truss_train/definitions.py,sha256=RZs4bCWkq7gBJALDLgmd4QxjlxWk6GMs2a62kiAalvw,6758
-truss_train/deployment.py,sha256=zmeJ66kg1Wc7l7bwA_cXqv85uMF77hYl7NPHuhc1NPs,2493
+truss_train/definitions.py,sha256=V985HhY4rdXL10DZxpFEpze9ScxzWErMht4WwaPknGU,6789
+truss_train/deployment.py,sha256=fDYRfzFRtVKMRVG0bKXYPmx6HXwLE0ukSQ0f81hG8kk,3020
 truss_train/loader.py,sha256=0o66EjBaHc2YY4syxxHVR4ordJWs13lNXnKjKq2wq0U,1630
 truss_train/public_api.py,sha256=9N_NstiUlmBuLUwH_fNG_1x7OhGCytZLNvqKXBlStrM,1220
-truss-0.10.9rc538.dist-info/METADATA,sha256=FYmavkZGrV6sXYBVv98hgPBT3XRi4SE1Oq_0MssgDoE,6674
-truss-0.10.9rc538.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truss-0.10.9rc538.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
-truss-0.10.9rc538.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
-truss-0.10.9rc538.dist-info/RECORD,,
+truss-0.10.10.dist-info/METADATA,sha256=5q5tQ4MtWhQspNwHEsMnSDOLj-fYFeB7zL4VinS2I28,6670
+truss-0.10.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truss-0.10.10.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
+truss-0.10.10.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
+truss-0.10.10.dist-info/RECORD,,

truss_train/definitions.py

@@ -127,6 +127,7 @@ class TrainingJob(custom_types.SafeModelNoExtra):
     image: Image
     compute: Compute = Compute()
     runtime: Runtime = Runtime()
+    name: Optional[str] = None
 
     def model_dump(self, *args, **kwargs):
         data = super().model_dump(*args, **kwargs)

truss_train/deployment.py

@@ -1,8 +1,9 @@
 import pathlib
 from pathlib import Path
-from typing import List
+from typing import List, Optional
 
 from truss.base.custom_types import SafeModel
+from truss.cli.utils.output import console
 from truss.remote.baseten import custom_types as b10_types
 from truss.remote.baseten.api import BasetenApi
 from truss.remote.baseten.core import archive_dir
@@ -44,6 +45,7 @@ def prepare_push(api: BasetenApi, config: pathlib.Path, training_job: TrainingJo
         image=training_job.image,
         runtime=training_job.runtime,
         compute=training_job.compute,
+        name=training_job.name,
         runtime_artifacts=[
             S3Artifact(s3_key=credentials["s3_key"], s3_bucket=credentials["s3_bucket"])
         ],
@@ -57,14 +59,25 @@ def create_training_job(
         training_project=training_project
     )
     prepared_job = prepare_push(remote_provider.api, config, training_project.job)
+
     job_resp = remote_provider.api.create_training_job(
         project_id=project_resp["id"], job=prepared_job
     )
     return job_resp
 
 
-def create_training_job_from_file(remote_provider: BasetenRemote, config: Path) -> dict:
+def create_training_job_from_file(
+    remote_provider: BasetenRemote,
+    config: Path,
+    job_name_from_cli: Optional[str] = None,
+) -> dict:
     with loader.import_training_project(config) as training_project:
+        if job_name_from_cli:
+            if training_project.job.name:
+                console.print(
+                    f"[bold yellow]⚠ Warning:[/bold yellow] name '{training_project.job.name}' provided in config file will be ignored. Using job name '{job_name_from_cli}' provided via --job-name flag."
+                )
+            training_project.job.name = job_name_from_cli
         job_resp = create_training_job(
             remote_provider=remote_provider,
             training_project=training_project,

truss/tests/util/test_basetenpointer.py

@@ -1,227 +0,0 @@
-import time
-from pathlib import Path
-from tempfile import TemporaryDirectory
-
-import pytest
-import requests
-from huggingface_hub.errors import HfHubHTTPError
-
-from truss.base.truss_config import ModelCache, ModelRepo
-from truss.util.basetenpointer import model_cache_hf_to_b10ptr
-
-
-def test_dolly_12b():
-    ModelCached = ModelCache(
-        [
-            dict(
-                repo_id="databricks/dolly-v2-12b",
-                revision="19308160448536e378e3db21a73a751579ee7fdd",
-                use_volume=True,
-                volume_folder="databricks_dolly_v2_12b",
-                runtime_secret_name="hf_access_token",
-            )
-        ]
-    )
-    for _ in range(2):
-        try:
-            bptr = model_cache_hf_to_b10ptr(ModelCached)
-            continue
-        # timeout by huggingface hub timeout error
-        except requests.exceptions.ReadTimeout as e:
-            # this is expected to timeout when the request takes too long
-            # due to the large size of the model
-            print("ReadTimeout Error: ", e)
-            pytest.skip(
-                "Skipping test due to ReadTimeout error from Hugging Face API, "
-                "this can happen for large models like Dolly-12b"
-            )
-        except HfHubHTTPError as e:
-            if e.response.status_code == 429:
-                pytest.skip("Hugging Face API rate limit exceeded")
-            raise
-    bptr_list = bptr.pointers
-    expected = [
-        {
-            "resolution": {
-                "url": "https://huggingface.co/databricks/dolly-v2-12b/resolve/19308160448536e378e3db21a73a751579ee7fdd/.gitattributes",
-                "expiration_timestamp": 2373918212,
-            },
-            "uid": "databricks/dolly-v2-12b:19308160448536e378e3db21a73a751579ee7fdd:.gitattributes",
-            "file_name": "/app/model_cache/databricks_dolly_v2_12b/.gitattributes",
-            "hashtype": "etag",
-            "hash": "c7d9f3332a950355d5a77d85000f05e6f45435ea",
-            "size": 1477,
-        },
-        {
-            "resolution": {
-                "url": "https://huggingface.co/databricks/dolly-v2-12b/resolve/19308160448536e378e3db21a73a751579ee7fdd/README.md",
-                "expiration_timestamp": 2373918212,
-            },
-            "uid": "databricks/dolly-v2-12b:19308160448536e378e3db21a73a751579ee7fdd:README.md",
-            "file_name": "/app/model_cache/databricks_dolly_v2_12b/README.md",
-            "hashtype": "etag",
-            "hash": "2912eb39545af0367335cff448d07214519c5eed",
-            "size": 10746,
-        },
-        {
-            "resolution": {
-                "url": "https://huggingface.co/databricks/dolly-v2-12b/resolve/19308160448536e378e3db21a73a751579ee7fdd/config.json",
-                "expiration_timestamp": 2373918212,
-            },
-            "uid": "databricks/dolly-v2-12b:19308160448536e378e3db21a73a751579ee7fdd:config.json",
-            "file_name": "/app/model_cache/databricks_dolly_v2_12b/config.json",
-            "hashtype": "etag",
-            "hash": "888c677eda015e2375fad52d75062d14b30ebad9",
-            "size": 818,
-        },
-        {
-            "resolution": {
-                "url": "https://huggingface.co/databricks/dolly-v2-12b/resolve/19308160448536e378e3db21a73a751579ee7fdd/instruct_pipeline.py",
-                "expiration_timestamp": 2373918212,
-            },
-            "uid": "databricks/dolly-v2-12b:19308160448536e378e3db21a73a751579ee7fdd:instruct_pipeline.py",
-            "file_name": "/app/model_cache/databricks_dolly_v2_12b/instruct_pipeline.py",
-            "hashtype": "etag",
-            "hash": "f8b291569e936cf104f44d003f95451bf5e1f965",
-            "size": 9159,
-        },
-        {
-            "resolution": {
-                "url": "https://huggingface.co/databricks/dolly-v2-12b/resolve/19308160448536e378e3db21a73a751579ee7fdd/pytorch_model.bin",
-                "expiration_timestamp": 2373918212,
-            },
-            "uid": "databricks/dolly-v2-12b:19308160448536e378e3db21a73a751579ee7fdd:pytorch_model.bin",
-            "file_name": "/app/model_cache/databricks_dolly_v2_12b/pytorch_model.bin",
-            "hashtype": "etag",
-            "hash": "19e10711310992c310c3775964c7635f4b28dd86587403e718c6d6d524a406a5",
-            "size": 23834965761,
-        },
-        {
-            "resolution": {
-                "url": "https://huggingface.co/databricks/dolly-v2-12b/resolve/19308160448536e378e3db21a73a751579ee7fdd/special_tokens_map.json",
-                "expiration_timestamp": 2373918212,
-            },
-            "uid": "databricks/dolly-v2-12b:19308160448536e378e3db21a73a751579ee7fdd:special_tokens_map.json",
-            "file_name": "/app/model_cache/databricks_dolly_v2_12b/special_tokens_map.json",
-            "hashtype": "etag",
-            "hash": "ecc1ee07dec13ee276fa9f1b29a1078da3280a4d",
-            "size": 228,
-        },
-        {
-            "resolution": {
-                "url": "https://huggingface.co/databricks/dolly-v2-12b/resolve/19308160448536e378e3db21a73a751579ee7fdd/tokenizer.json",
-                "expiration_timestamp": 2373918212,
-            },
-            "uid": "databricks/dolly-v2-12b:19308160448536e378e3db21a73a751579ee7fdd:tokenizer.json",
-            "file_name": "/app/model_cache/databricks_dolly_v2_12b/tokenizer.json",
-            "hashtype": "etag",
-            "hash": "22868c8caf99a303c1a44bfea98f20f4254fc0e5",
-            "size": 2114274,
-        },
-        {
-            "resolution": {
-                "url": "https://huggingface.co/databricks/dolly-v2-12b/resolve/19308160448536e378e3db21a73a751579ee7fdd/tokenizer_config.json",
-                "expiration_timestamp": 2373918212,
-            },
-            "uid": "databricks/dolly-v2-12b:19308160448536e378e3db21a73a751579ee7fdd:tokenizer_config.json",
-            "file_name": "/app/model_cache/databricks_dolly_v2_12b/tokenizer_config.json",
-            "hashtype": "etag",
-            "hash": "51e564ead5d28eebc74b25d86f0a694b7c7cc618",
-            "size": 449,
-        },
-    ]
-    assert len(bptr_list) == len(expected), (
-        f"Expected {len(expected)} but got {len(bptr_list)}"
-    )
-    for expected, actual in zip(expected, bptr_list):
-        assert expected["uid"] == actual.uid, (
-            f"Expected uid {expected['uid']} but got {actual.uid}"
-        )
-        assert expected["file_name"] == actual.file_name, (
-            f"Expected file_name {expected['file_name']} but got {actual.file_name}"
-        )
-        assert expected["hash"] == actual.hash, (
-            f"Expected hash {expected['hash']} but got {actual.hash}"
-        )
-        assert expected["size"] == actual.size, (
-            f"Expected size {expected['size']} but got {actual.size}"
-        )
-        assert expected["resolution"]["url"] == actual.resolution.url, (
-            f"Expected resolution url {expected['resolution']['url']} but got {actual.resolution.url}"
-        )
-        # 100 years or more ahead
-        assert (
-            actual.resolution.expiration_timestamp
-            >= time.time() + 20 * 365 * 24 * 60 * 60
-        ), (
-            f"Expected unix expiration timestamp to be at least 20 years ahead, but got {actual.resolution.expiration_timestamp}. "
-        )
-
-    # download first file and verify size
-    with TemporaryDirectory() as tmp:
-        # Get the first pointer (.gitattributes)
-        first_pointer = bptr_list[0]
-        tmp_path = Path(tmp) / "downloaded_file"
-
-        # Download the file
-        response = requests.get(first_pointer.resolution.url)
-        response.raise_for_status()
-
-        # Save the file
-        tmp_path.write_bytes(response.content)
-
-        # Verify file size matches metadata
-        actual_size = tmp_path.stat().st_size
-        assert actual_size == first_pointer.size, (
-            f"Downloaded file size {actual_size} does not match expected size {first_pointer.size}"
-        )
-
-
-def test_with_main():
-    # main should be resolved to 41dec486b25746052d3335decc8f5961607418a0
-    cache = ModelCache(
-        [
-            ModelRepo(
-                repo_id="intfloat/llm-retriever-base",
-                revision="main",
-                ignore_patterns=["*.json", "*.txt", "*.md", "*.bin", "*.model"],
-                volume_folder="mistral_demo",
-                use_volume=True,
-            )
-        ]
-    )
-    b10ptr = model_cache_hf_to_b10ptr(cache)
-    expected = {
-        "pointers": [
-            {
-                "resolution": {
-                    "url": "https://huggingface.co/intfloat/llm-retriever-base/resolve/41dec486b25746052d3335decc8f5961607418a0/.gitattributes",
-                    "expiration_timestamp": 4044816725,
-                },
-                "uid": "intfloat/llm-retriever-base:main:.gitattributes",
-                "file_name": "/app/model_cache/mistral_demo/.gitattributes",
-                "hashtype": "etag",
-                "hash": "a6344aac8c09253b3b630fb776ae94478aa0275b",
-                "size": 1519,
-                "runtime_secret_name": "hf_access_token",
-            },
-            {
-                "resolution": {
-                    "url": "https://huggingface.co/intfloat/llm-retriever-base/resolve/41dec486b25746052d3335decc8f5961607418a0/model.safetensors",
-                    "expiration_timestamp": 4044816725,
-                },
-                "uid": "intfloat/llm-retriever-base:main:model.safetensors",
-                "file_name": "/app/model_cache/mistral_demo/model.safetensors",
-                "hashtype": "etag",
-                "hash": "565dd4f1cc6318ccf07af8680c27fd935b3b56ca2684d1af58abcd4e8bf6ecfa",
-                "size": 437955512,
-                "runtime_secret_name": "hf_access_token",
-            },
-        ]
-    }
-    assert b10ptr.model_dump() == expected
-
-
-if __name__ == "__main__":
-    test_dolly_12b()
-    test_with_main()

truss/util/basetenpointer.py

@@ -1,160 +0,0 @@
-"""This file contains the utils to create a basetenpointer from a huggingface repo, which can be resolved at runtime."""
-
-import time
-from pathlib import Path
-from typing import TYPE_CHECKING, Optional
-
-import requests
-from huggingface_hub import hf_api, hf_hub_url
-from huggingface_hub.utils import filter_repo_objects
-from pydantic import BaseModel
-
-if TYPE_CHECKING:
-    from truss.base.truss_config import ModelCache
-
-
-# copied from: https://github.com/basetenlabs/baseten/blob/caeba66cd544a5152bb6a018d6ac2871814f327b/baseten_shared/baseten_shared/lms/types.py#L13
-class Resolution(BaseModel):
-    url: str
-    expiration_timestamp: int
-
-
-class BasetenPointer(BaseModel):
-    resolution: Optional[Resolution] = None
-    uid: str
-    file_name: str
-    hashtype: str
-    hash: str
-    size: int
-    runtime_secret_name: str = "hf_access_token"  # TODO: remove the default
-
-
-class BasetenPointerList(BaseModel):
-    pointers: list[BasetenPointer]
-
-
-def get_hf_metadata(api: "hf_api.HfApi", repo: str, revision: str, file: str):
-    url = hf_hub_url(repo_id=repo, revision=revision, filename=file)
-    meta = api.get_hf_file_metadata(url=url)
-    return {"etag": meta.etag, "location": meta.location, "size": meta.size, "url": url}
-
-
-def filter_repo_files(
-    files: list[str],
-    allow_patterns: Optional[list[str]],
-    ignore_patterns: Optional[list[str]],
-) -> list[str]:
-    return list(
-        filter_repo_objects(
-            items=files, allow_patterns=allow_patterns, ignore_patterns=ignore_patterns
-        )
-    )
-
-
-def metadata_hf_repo(
-    repo: str,
-    revision: str,
-    allow_patterns: Optional[list[str]] = None,
-    ignore_patterns: Optional[list[str]] = None,
-) -> dict[str, dict]:
-    """Lists all files, gathers metadata without downloading, just using the Hugging Face API.
-    Example:
-    [{'.gitattributes': HfFileMetadata(
-    commit_hash='07163b72af1488142a360786df853f237b1a3ca1',
-    etag='a6344aac8c09253b3b630fb776ae94478aa0275b',
-    location='https://huggingface.co/intfloat/e5-mistral-7b-instruct/resolve/main/.gitattributes',
-    url='https://huggingface.co/intfloat/e5-mistral-7b-instruct/resolve/main/.gitattributes',
-    size=1519)]
-    """
-    api = hf_api.HfApi()
-    model_info = api.model_info(repo_id=repo, revision=revision)
-    real_revision = model_info.sha
-    real_revision = real_revision or revision
-    if revision != real_revision:
-        print(
-            f"Warning: revision {revision} is moving, using {real_revision} instead. "
-            f"Please update your code to use `revision={real_revision}` instead otherwise you will keep moving. "
-        )
-    files: list[str] = api.list_repo_files(repo_id=repo, revision=real_revision)
-    files = filter_repo_files(
-        files, allow_patterns=allow_patterns, ignore_patterns=ignore_patterns
-    )
-
-    hf_files_meta = {
-        file: get_hf_metadata(api, repo, real_revision, file) for file in files
-    }
-
-    return hf_files_meta
-
-
-def model_cache_hf_to_b10ptr(cache: "ModelCache") -> BasetenPointerList:
-    """
-    Convert a ModelCache object to a BasetenPointer object.
-    """
-    assert cache.is_v2, "ModelCache is not v2"
-
-    basetenpointers: list[BasetenPointer] = []
-
-    for model in cache.models:
-        assert model.revision is not None, "ModelCache is not v2, revision is None"
-        exception = None
-        for _ in range(3):
-            try:
-                metadata_hf_repo_list = metadata_hf_repo(
-                    repo=model.repo_id,
-                    revision=model.revision,
-                    allow_patterns=model.allow_patterns,
-                    ignore_patterns=model.ignore_patterns,
-                )
-                break
-            except requests.exceptions.ReadTimeout as e:
-                # this is expected, sometimes huggingface hub times out
-                print("ReadTimeout Error: ", e)
-                time.sleep(5)
-                exception = e
-            except Exception as e:
-                raise e
-        else:
-            # if we get here, we have exhausted the retries
-            assert exception is not None, "ReadTimeout Error: " + str(exception)
-            raise exception
-        # convert the metadata to b10 pointer format
-        b10_pointer_list = [
-            BasetenPointer(
-                uid=f"{model.repo_id}:{model.revision}:{filename}",
-                file_name=(Path(model.runtime_path) / filename).as_posix(),
-                hashtype="etag",
-                hash=content["etag"],
-                size=content["size"],
-                runtime_secret_name=model.runtime_secret_name,
-                resolution=Resolution(
-                    url=content["url"],
-                    expiration_timestamp=int(
-                        4044816725  # 90 years in the future, hf does not expire. needs to be static, to have cache hits.
-                    ),
-                ),
-            )
-            for filename, content in metadata_hf_repo_list.items()
-        ]
-        basetenpointers.extend(b10_pointer_list)
-
-    return BasetenPointerList(pointers=basetenpointers)
-
-
-if __name__ == "__main__":
-    # example usage
-    from truss.base.truss_config import ModelCache, ModelRepo
-
-    cache = ModelCache(
-        [
-            ModelRepo(
-                repo_id="intfloat/llm-retriever-base",
-                revision="main",
-                ignore_patterns=["*.json", "*.txt", "*.md", "*.bin", "*.model"],
-                volume_folder="mistral_demo",
-                use_volume=True,
-            )
-        ]
-    )
-    b10ptr = model_cache_hf_to_b10ptr(cache)
-    print(b10ptr.model_dump_json())