truefoundry 0.5.10rc1__py3-none-any.whl → 0.5.11rc1__py3-none-any.whl

truefoundry/__init__.py

@@ -1,3 +1,14 @@
+from truefoundry_sdk import (
+    AssistantMessage,
+    ChatPromptManifest,
+    ModelConfiguration,
+    Parameters,
+    PromptVersion,
+    SystemMessage,
+    UserMessage,
+)
+
+from truefoundry._client import client
 from truefoundry.common.warnings import (
     suppress_truefoundry_deprecation_warnings,
     surface_truefoundry_deprecation_warnings,
@@ -6,7 +17,15 @@ from truefoundry.deploy.core import login, logout
 
 surface_truefoundry_deprecation_warnings()
 __all__ = [
+    "AssistantMessage",
+    "ChatPromptManifest",
+    "client",
     "login",
     "logout",
+    "ModelConfiguration",
+    "Parameters",
+    "PromptVersion",
     "suppress_truefoundry_deprecation_warnings",
+    "SystemMessage",
+    "UserMessage",
 ]

truefoundry/_client.py

@@ -0,0 +1,36 @@
+import truefoundry_sdk
+from truefoundry_sdk.core.client_wrapper import SyncClientWrapper
+
+from truefoundry.common.session import Session
+
+
+def _get_base_url(self: SyncClientWrapper) -> str:
+    if not isinstance(self._base_url, str):
+        self._base_url = self._base_url()
+    return self._base_url
+
+
+class _LazyTrueFoundry(truefoundry_sdk.TrueFoundry):
+    def _get_session(self) -> Session:
+        if self._session is None:
+            self._session = Session.new()
+        return self._session
+
+    def __init__(self):
+        self._session = None
+        # We patch this because SyncClientWrapper.get_base_url is expected to return a string but
+        # we need to ensure that the base_url is only resolved once any requests are made
+        # Flow:
+        # internal http client tries to resolve base_url
+        #   -> SyncClientWrapper.get_base_url (_get_base_url)
+        #     -> self._get_session().tfy_host   # where self._get_session itself caches the session instance
+        SyncClientWrapper.get_base_url = _get_base_url
+        super().__init__(
+            # since our base_url resolving is tied to session creation, we pass a callable that
+            # the above _get_base_url will replace with the resolved result
+            base_url=lambda: self._get_session().tfy_host,  # type: ignore
+            api_key=lambda: self._get_session().access_token,
+        )
+
+
+client = _LazyTrueFoundry()

truefoundry/cli/display_util.py

@@ -38,7 +38,7 @@ def stringify(x):
         return str(x)
 
 
-def display_time_passed(seconds: int):
+def display_time_passed(seconds: float) -> str:
     m, s = divmod(seconds, 60)
     h, m = divmod(m, 60)
     d, h = divmod(h, 24)

truefoundry/common/utils.py

@@ -1,6 +1,7 @@
 import json
 import logging
 import os
+import platform
 import sys
 import time
 from collections import namedtuple
@@ -20,6 +21,7 @@ from truefoundry.common.constants import (
     TFY_INTERNAL_ENV_KEY,
 )
 from truefoundry.pydantic_v1 import BaseSettings
+from truefoundry.version import __version__
 
 logger = logging.getLogger(__name__)
 
@@ -192,3 +194,10 @@ def is_debug_env_set() -> bool:
 
 def is_internal_env_set() -> bool:
     return bool(os.getenv(TFY_INTERNAL_ENV_KEY))
+
+
+def get_user_agent() -> str:
+    try:
+        return f"truefoundry/{__version__} Python/{platform.python_version()} OS/{platform.system()}-{platform.release()} ({platform.architecture()[0]})"
+    except Exception:
+        return f"truefoundry/{__version__}"

truefoundry/deploy/__init__.py

@@ -1,4 +1,4 @@
-from truefoundry.deploy.auto_gen.models import (
+from truefoundry.deploy._autogen.models import (
     AppProtocol,
     Autoshutdown,
     CanaryStep,
@@ -82,7 +82,7 @@ from truefoundry.deploy.v2.lib.patched_models import (
     HttpProbe,
     HuggingfaceArtifactSource,
     Image,
-    JwtAuthCreds,
+    JwtAuthConfig,
     KafkaInputConfig,
     KafkaMetricConfig,
     KafkaOutputConfig,