truefoundry 0.5.2rc1__tar.gz → 0.5.3__tar.gz

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: truefoundry
-Version: 0.5.2rc1
+Version: 0.5.3
 Summary: Truefoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhishek@truefoundry.com

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "truefoundry"
-version = "0.5.2rc1"
+version = "0.5.3"
 description = "Truefoundry CLI"
 authors = ["Abhishek Choudhary <abhishek@truefoundry.com>"]
 readme = "README.md"

truefoundry-0.5.3/truefoundry/__init__.py

@@ -0,0 +1,12 @@
+from truefoundry.common.warnings import (
+    suppress_truefoundry_deprecation_warnings,
+    surface_truefoundry_deprecation_warnings,
+)
+from truefoundry.deploy.core import login, logout
+
+surface_truefoundry_deprecation_warnings()
+__all__ = [
+    "login",
+    "logout",
+    "suppress_truefoundry_deprecation_warnings",
+]

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/autodeploy/agents/base.py

@@ -17,12 +17,12 @@ from openai.types.chat.chat_completion_user_message_param import (
     ChatCompletionUserMessageParam,
 )
 from openai.types.shared_params.function_definition import FunctionDefinition
-from pydantic import BaseModel, ValidationError
 
 from truefoundry.autodeploy.constants import AUTODEPLOY_MODEL_NAME
 from truefoundry.autodeploy.logger import logger
 from truefoundry.autodeploy.tools import Event, RequestEvent, Tool
 from truefoundry.autodeploy.utils.pydantic_compat import model_dump, model_json_schema
+from truefoundry.pydantic_v1 import BaseModel, ValidationError
 
 
 def llm(

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/autodeploy/agents/developer.py

@@ -4,7 +4,6 @@ from typing import Dict, Optional
 
 import docker
 from openai import OpenAI
-from pydantic import Field
 
 from truefoundry.autodeploy.agents.base import Agent
 from truefoundry.autodeploy.agents.project_identifier import ProjectIdentifier
@@ -18,6 +17,7 @@ from truefoundry.autodeploy.tools import (
     RequestEvent,
     ResponseEvent,
 )
+from truefoundry.pydantic_v1 import Field
 
 
 class Developer(Agent):

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/autodeploy/agents/project_identifier.py

@@ -4,7 +4,6 @@ import enum
 from typing import List, Optional
 
 from openai import OpenAI
-from pydantic import Field
 from rich.console import Console
 
 from truefoundry.autodeploy.agents.base import Agent
@@ -16,6 +15,7 @@ from truefoundry.autodeploy.tools import (
     RequestEvent,
     ResponseEvent,
 )
+from truefoundry.pydantic_v1 import Field
 
 
 class ComponentType(str, enum.Enum):

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/autodeploy/agents/tester.py

@@ -4,7 +4,6 @@ from typing import Dict, Optional
 
 import docker
 from openai import OpenAI
-from pydantic import Field
 from rich.console import Console
 
 from truefoundry.autodeploy.agents.base import Agent
@@ -16,6 +15,7 @@ from truefoundry.autodeploy.tools import (
     ResponseEvent,
     SendRequest,
 )
+from truefoundry.pydantic_v1 import Field
 
 
 class Tester(Agent):

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/autodeploy/cli.py

@@ -31,9 +31,9 @@ from truefoundry.autodeploy.tools.ask import AskQuestion
 from truefoundry.autodeploy.tools.commit import CommitConfirmation
 from truefoundry.autodeploy.tools.docker_run import DockerRun, DockerRunLog
 from truefoundry.autodeploy.utils.client import get_git_binary
+from truefoundry.cli.const import COMMAND_CLS
+from truefoundry.common.session import Session
 from truefoundry.deploy import Build, DockerFileBuild, Job, LocalSource, Port, Service
-from truefoundry.deploy.cli.const import COMMAND_CLS
-from truefoundry.deploy.lib.auth.servicefoundry_session import ServiceFoundrySession
 from truefoundry.deploy.lib.clients.servicefoundry_client import (
     ServiceFoundryServiceClient,
 )
@@ -45,7 +45,7 @@ def _get_openai_client() -> OpenAI:
             api_key=AUTODEPLOY_OPENAI_API_KEY, base_url=AUTODEPLOY_OPENAI_BASE_URL
         )
     try:
-        session = ServiceFoundrySession()
+        session = Session.new()
         resp = requests.get(
             f"{AUTODEPLOY_TFY_BASE_URL}/api/svc/v1/llm-gateway/access-details",
             headers={

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/autodeploy/tools/base.py

@@ -2,9 +2,10 @@ from __future__ import annotations
 
 from typing import Any, ClassVar, Generator, Optional, Protocol, Type
 
-from pydantic import BaseModel
 from rich.console import Console
 
+from truefoundry.pydantic_v1 import BaseModel
+
 
 class Event(BaseModel):
     def render(self, _: Console) -> Optional[Any]: ...

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/autodeploy/tools/commit.py

@@ -4,7 +4,6 @@ import os
 import tempfile
 from typing import Any, Generator, Optional
 
-from pydantic import Field
 from rich.console import Console
 from rich.padding import Padding
 from rich.prompt import Confirm
@@ -20,6 +19,7 @@ from truefoundry.autodeploy.tools.base import (
 from truefoundry.autodeploy.utils.client import get_git_binary
 from truefoundry.autodeploy.utils.diff import LLMDiff
 from truefoundry.autodeploy.utils.pydantic_compat import model_dump
+from truefoundry.pydantic_v1 import Field
 
 
 class CommitConfirmation(Event):

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/autodeploy/tools/docker_build.py

@@ -6,7 +6,6 @@ from typing import Any, Generator, Iterable, Optional
 
 import docker
 from docker.models.images import BuildError, json_stream
-from pydantic import Field
 from rich.console import Console, ConsoleOptions, RenderResult
 from rich.padding import Padding
 from rich.text import Text
@@ -19,6 +18,7 @@ from truefoundry.autodeploy.tools.base import (
     Rule,
     Tool,
 )
+from truefoundry.pydantic_v1 import Field
 
 
 class DockerBuildLog(Event):

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/autodeploy/tools/docker_run.py

@@ -5,7 +5,6 @@ from typing import Any, Dict, Generator, List, Optional
 
 import docker
 import requests
-from pydantic import Field
 from rich.console import Console, ConsoleOptions, RenderResult
 from rich.padding import Padding
 from rich.text import Text
@@ -18,6 +17,7 @@ from truefoundry.autodeploy.tools.base import (
     Rule,
     Tool,
 )
+from truefoundry.pydantic_v1 import Field
 
 
 class DockerRunLog(Event):

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/autodeploy/tools/file_type_counts.py

@@ -5,7 +5,6 @@ from collections import Counter
 from typing import Any, Dict, Generator
 
 import gitignorefile
-from pydantic import Field
 from rich.console import Console
 from rich.table import Table
 
@@ -17,6 +16,7 @@ from truefoundry.autodeploy.tools.base import (
     Rule,
     Tool,
 )
+from truefoundry.pydantic_v1 import Field
 
 
 class ShowFileCount(Event):

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/autodeploy/tools/list_files.py

@@ -5,7 +5,6 @@ from fnmatch import fnmatch
 from typing import Any, Generator, List, Optional
 
 import gitignorefile
-from pydantic import Field
 
 from truefoundry.autodeploy.tools.base import (
     Event,
@@ -15,6 +14,7 @@ from truefoundry.autodeploy.tools.base import (
     Rule,
     Tool,
 )
+from truefoundry.pydantic_v1 import Field
 
 
 class ListFiles(Tool):

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/autodeploy/tools/read_file.py

@@ -3,8 +3,6 @@ from __future__ import annotations
 import os
 from typing import Any, Generator, List, Optional
 
-from pydantic import BaseModel, Field
-
 from truefoundry.autodeploy.constants import MAX_FILE_SIZE_READ
 from truefoundry.autodeploy.tools.base import (
     Event,
@@ -14,6 +12,7 @@ from truefoundry.autodeploy.tools.base import (
     Rule,
     Tool,
 )
+from truefoundry.pydantic_v1 import BaseModel, Field
 
 
 class Line(BaseModel):

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/autodeploy/tools/send_request.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import Any, Generator, Optional
 
 import requests
-from pydantic import Field
 
 from truefoundry.autodeploy.tools.base import (
     Event,
@@ -13,6 +12,7 @@ from truefoundry.autodeploy.tools.base import (
     Rule,
     Tool,
 )
+from truefoundry.pydantic_v1 import Field
 
 
 class SendRequest(Tool):

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/autodeploy/tools/write_file.py

@@ -4,12 +4,12 @@ from __future__ import annotations
 import os
 from typing import Optional
 
-from pydantic import BaseModel, Field
 from rich.console import Console
 from rich.prompt import Confirm
 
 from truefoundry.autodeploy.tools.base import Tool
 from truefoundry.autodeploy.utils.diff import Diff
+from truefoundry.pydantic_v1 import BaseModel, Field
 
 INTERACTIVE_SESSION = True
 

truefoundry-0.5.2rc1/truefoundry/deploy/cli/cli.py → truefoundry-0.5.3/truefoundry/cli/__main__.py

@@ -4,6 +4,10 @@ import sys
 import rich_click as click
 
 from truefoundry import logger
+from truefoundry.cli.config import CliConfig
+from truefoundry.cli.const import GROUP_CLS
+from truefoundry.cli.util import setup_rich_click
+from truefoundry.common.utils import is_debug_env_set, is_internal_env_set
 from truefoundry.deploy.cli.commands import (
     get_apply_command,
     get_build_command,
@@ -17,40 +21,11 @@ from truefoundry.deploy.cli.commands import (
     get_terminate_command,
     get_trigger_command,
 )
-from truefoundry.deploy.cli.config import CliConfig
-from truefoundry.deploy.cli.const import GROUP_CLS
-from truefoundry.deploy.cli.util import setup_rich_click
-from truefoundry.deploy.lib.util import is_debug_env_set, is_internal_env_set
+from truefoundry.ml.cli.cli import get_ml_cli
 from truefoundry.version import __version__
 
 click.rich_click.USE_RICH_MARKUP = True
 
-
-def create_truefoundry_cli() -> click.MultiCommand:
-    """Generates CLI by combining all subcommands into a main CLI and returns in
-
-    Returns:
-        function: main CLI functions will all added sub-commands
-    """
-    cli = truefoundry_cli
-    cli.add_command(get_login_command())
-    cli.add_command(get_logout_command())
-    cli.add_command(get_apply_command())
-    cli.add_command(get_deploy_command())
-    cli.add_command(get_deploy_init_command())
-    cli.add_command(get_patch_application_command())
-    cli.add_command(get_delete_command())
-    cli.add_command(get_trigger_command())
-    cli.add_command(get_terminate_command())
-
-    if not (sys.platform.startswith("win32") or sys.platform.startswith("cygwin")):
-        cli.add_command(get_patch_command())
-
-    if is_internal_env_set():
-        cli.add_command(get_build_command())
-    return cli
-
-
 CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])  # noqa: C408
 
 
@@ -94,3 +69,45 @@ def truefoundry_cli(ctx, json, debug):
     if debug:
         log_level = logging.DEBUG
     logger.add_cli_handler(level=log_level)
+
+
+def create_truefoundry_cli() -> click.MultiCommand:
+    """Generates CLI by combining all subcommands into a main CLI and returns in
+
+    Returns:
+        function: main CLI functions will all added sub-commands
+    """
+    cli = truefoundry_cli
+    cli.add_command(get_login_command())
+    cli.add_command(get_logout_command())
+    cli.add_command(get_apply_command())
+    cli.add_command(get_deploy_command())
+    cli.add_command(get_deploy_init_command())
+    cli.add_command(get_patch_application_command())
+    cli.add_command(get_delete_command())
+    cli.add_command(get_trigger_command())
+    cli.add_command(get_terminate_command())
+    cli.add_command(get_ml_cli())
+
+    if not (sys.platform.startswith("win32") or sys.platform.startswith("cygwin")):
+        cli.add_command(get_patch_command())
+
+    if is_internal_env_set():
+        cli.add_command(get_build_command())
+    return cli
+
+
+def main():
+    # Exit the interpreter by raising SystemExit(status).
+    # If the status is omitted or None, it defaults to zero (i.e., success).
+    # If the status is an integer, it will be used as the system exit status.
+    # If it is another kind of object, it will be printed and the system exit status will be one (i.e., failure).
+    try:
+        cli = create_truefoundry_cli()
+    except Exception as e:
+        raise click.exceptions.UsageError(message=str(e)) from e
+    sys.exit(cli())
+
+
+if __name__ == "__main__":
+    main()

{truefoundry-0.5.2rc1/truefoundry/deploy → truefoundry-0.5.3/truefoundry}/cli/display_util.py

@@ -5,10 +5,15 @@ from rich import box
 from rich import print_json as _rich_print_json
 from rich.table import Table
 
-from truefoundry.deploy.cli.config import CliConfig
-from truefoundry.deploy.cli.console import console
-from truefoundry.deploy.cli.const import DISPLAY_DATETIME_FORMAT
-from truefoundry.deploy.json_util import json_default_encoder
+from truefoundry.cli.config import CliConfig
+from truefoundry.cli.console import console
+from truefoundry.cli.const import DISPLAY_DATETIME_FORMAT
+
+
+def json_default_encoder(o):
+    if isinstance(o, datetime.datetime):
+        return o.isoformat()
+    raise TypeError(f"Cannot json encode {type(o)}: {o}")
 
 
 def print_json(data, default=json_default_encoder):

{truefoundry-0.5.2rc1/truefoundry/deploy → truefoundry-0.5.3/truefoundry}/cli/util.py

@@ -5,17 +5,14 @@ from typing import Dict
 
 import rich_click as click
 from packaging.version import parse as parse_version
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError, Timeout
 from rich.padding import Padding
 from rich.panel import Panel
 from rich.table import Table
 
-from truefoundry.common.exceptions import BadRequestException
-from truefoundry.deploy.cli.console import console
-from truefoundry.deploy.lib.exceptions import (
-    ConfigurationException,
-)
-from truefoundry.deploy.lib.util import is_debug_env_set
+from truefoundry.cli.console import console
+from truefoundry.common.exceptions import HttpRequestException
+from truefoundry.common.utils import is_debug_env_set
 
 
 def setup_rich_click():
@@ -28,26 +25,29 @@ def setup_rich_click():
 def handle_exception(exception):
     if is_debug_env_set():
         console.print_exception(show_locals=True)
-    if isinstance(exception, BadRequestException):
+    if isinstance(exception, HttpRequestException):
         print_dict_as_table_panel(
             {"Status Code": str(exception.status_code), "Error": exception.message},
             title="Command Failed",
             border_style="red",
         )
-    elif isinstance(exception, ConnectionError):
+    elif isinstance(exception, Timeout):
         loc = ""
         if exception.request:
             loc = f" at {exception.request.url}"
         print_dict_as_table_panel(
-            {
-                "Error": f"Couldn't connect to TrueFoundry{loc}. Please make sure that the provided `--host` is correct."
-            },
+            {"Error": f"Request to TrueFoundry{loc} timed out."},
             title="Command Failed",
             border_style="red",
         )
-    elif isinstance(exception, ConfigurationException):
+    elif isinstance(exception, ConnectionError):
+        loc = ""
+        if exception.request:
+            loc = f" at {exception.request.url}"
         print_dict_as_table_panel(
-            {"Error": exception.message},
+            {
+                "Error": f"Couldn't connect to TrueFoundry{loc}. Please make sure that the provided `--host` is correct."
+            },
             title="Command Failed",
             border_style="red",
         )

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/common/auth_service_client.py

@@ -7,7 +7,10 @@ import requests
 from truefoundry.common.constants import VERSION_PREFIX
 from truefoundry.common.entities import DeviceCode, Token
 from truefoundry.common.exceptions import BadRequestException
-from truefoundry.common.request_utils import request_handling, requests_retry_session
+from truefoundry.common.request_utils import (
+    request_handling,
+    requests_retry_session,
+)
 from truefoundry.common.utils import poll_for_function, relogin_error_message
 from truefoundry.logger import logger
 
@@ -16,14 +19,13 @@ class AuthServiceClient(ABC):
     def __init__(self, tenant_name: str):
         self._tenant_name = tenant_name
 
-    # TODO (chiragjn): Rename base_url to tfy_host
     @classmethod
-    def from_base_url(cls, base_url: str) -> "AuthServiceClient":
+    def from_tfy_host(cls, tfy_host: str) -> "AuthServiceClient":
         from truefoundry.common.servicefoundry_client import (
             ServiceFoundryServiceClient,
         )
 
-        client = ServiceFoundryServiceClient(base_url=base_url)
+        client = ServiceFoundryServiceClient(tfy_host=tfy_host)
         if client.python_sdk_config.use_sfy_server_auth_apis:
             return ServiceFoundryServerAuthServiceClient(
                 tenant_name=client.tenant_info.tenant_name, url=client._api_server_url
@@ -159,6 +161,7 @@ class AuthServerServiceClient(AuthServiceClient):
         session = requests_retry_session(retries=2)
         response = session.post(url, json=data)
         response_data = request_handling(response)
+        assert isinstance(response_data, dict)
         # TODO: temporary cleanup of incorrect attributes
         return DeviceCode.parse_obj(
             {

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/common/constants.py

@@ -11,6 +11,8 @@ CREDENTIAL_FILEPATH = TFY_CONFIG_DIR / "credentials.json"
 # These keys are kept separately because we use them in error messages and some checks
 TFY_HOST_ENV_KEY = "TFY_HOST"
 TFY_API_KEY_ENV_KEY = "TFY_API_KEY"
+TFY_DEBUG_ENV_KEY = "TFY_DEBUG"
+TFY_INTERNAL_ENV_KEY = "TFY_INTERNAL"
 
 TFY_INTERNAL_SIGNED_URL_SERVER_HOST_ENV_KEY = "TFY_INTERNAL_SIGNED_URL_SERVER_HOST"
 TFY_INTERNAL_SIGNED_URL_SERVER_TOKEN_ENV_KEY = "TFY_INTERNAL_SIGNED_URL_SERVER_TOKEN"
@@ -36,6 +38,9 @@ class TrueFoundrySdkEnv(BaseSettings):
     )
     TFY_INTERNAL_SIGNED_URL_SERVER_MAX_TIMEOUT: int = 5  # default: 5 seconds
     TFY_INTERNAL_SIGNED_URL_SERVER_DEFAULT_TTL: int = 3600  # default: 1 hour
+    TFY_INTERNAL_MULTIPART_UPLOAD_FINALIZE_SIGNED_URL_TIMEOUT: int = (
+        24 * 60 * 60
+    )  # default: 24 hour
     TFY_INTERNAL_SIGNED_URL_REQUEST_TIMEOUT: int = 3600  # default: 1 hour
     TFY_INTERNAL_SIGNED_URL_CLIENT_LOG_LEVEL: str = "WARNING"
 

{truefoundry-0.5.2rc1 → truefoundry-0.5.3}/truefoundry/common/credential_provider.py

@@ -17,10 +17,9 @@ class CredentialProvider(ABC):
     @abstractmethod
     def token(self) -> Token: ...
 
-    # TODO (chiragjn): Rename base_url to tfy_host
     @property
     @abstractmethod
-    def base_url(self) -> str: ...
+    def tfy_host(self) -> str: ...
 
     @staticmethod
     @abstractmethod
@@ -38,7 +37,7 @@ class EnvCredentialProvider(CredentialProvider):
                 f"Value of {TFY_API_KEY_ENV_KEY} env var should be non-empty string"
             )
         self._host = resolve_tfy_host()
-        self._auth_service = AuthServiceClient.from_base_url(base_url=self._host)
+        self._auth_service = AuthServiceClient.from_tfy_host(tfy_host=self._host)
         self._token: Token = Token(access_token=api_key, refresh_token=None)  # type: ignore[call-arg]
 
     @staticmethod
@@ -51,12 +50,12 @@ class EnvCredentialProvider(CredentialProvider):
             if self._token.is_going_to_be_expired():
                 logger.info("Refreshing access token")
                 self._token = self._auth_service.refresh_token(
-                    self._token, self.base_url
+                    self._token, self.tfy_host
                 )
             return self._token
 
     @property
-    def base_url(self) -> str:
+    def tfy_host(self) -> str:
         return self._host
 
 
@@ -70,7 +69,7 @@ class FileCredentialProvider(CredentialProvider):
             self._token = self._last_cred_file_content.to_token()
             self._host = self._last_cred_file_content.host
 
-        self._auth_service = AuthServiceClient.from_base_url(base_url=self._host)
+        self._auth_service = AuthServiceClient.from_tfy_host(tfy_host=self._host)
 
     @staticmethod
     def can_provide() -> bool:
@@ -91,7 +90,7 @@ class FileCredentialProvider(CredentialProvider):
 
                 if new_cred_file_content == self._last_cred_file_content:
                     self._token = self._auth_service.refresh_token(
-                        self._token, self.base_url
+                        self._token, self.tfy_host
                     )
                     self._last_cred_file_content = CredentialsFileContent(
                         host=self._host,
@@ -115,5 +114,5 @@ class FileCredentialProvider(CredentialProvider):
                 )
 
     @property
-    def base_url(self) -> str:
+    def tfy_host(self) -> str:
         return self._host

truefoundry-0.5.3/truefoundry/common/exceptions.py

@@ -0,0 +1,16 @@
+from typing import Optional
+
+
+# TODO (chiragjn): We need to establish uniform exception handling across codebase
+class HttpRequestException(Exception):
+    def __init__(self, message: str, status_code: Optional[int] = None):
+        self.message = str(message)
+        self.status_code = status_code
+        super().__init__(message)
+
+    def __str__(self) -> str:
+        return self.message or ""
+
+
+class BadRequestException(HttpRequestException):
+    pass