truefoundry 0.5.3rc1__tar.gz → 0.5.3rc3__tar.gz

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

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

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "truefoundry"
-version = "0.5.3rc1"
+version = "0.5.3rc3"
 description = "Truefoundry CLI"
 authors = ["Abhishek Choudhary <abhishek@truefoundry.com>"]
 readme = "README.md"
@@ -139,6 +139,7 @@ warn_unused_ignores = true
 packages = [
     "truefoundry.common",
     "truefoundry.ml",
+    "truefoundry.gateway",
 ]
 exclude = [
     "^truefoundry/ml/autogen",

{truefoundry-0.5.3rc1 → truefoundry-0.5.3rc3}/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.3rc1 → truefoundry-0.5.3rc3}/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.3rc1 → truefoundry-0.5.3rc3}/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.3rc1 → truefoundry-0.5.3rc3}/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.3rc1 → truefoundry-0.5.3rc3}/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.3rc1 → truefoundry-0.5.3rc3}/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.3rc1 → truefoundry-0.5.3rc3}/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.3rc1 → truefoundry-0.5.3rc3}/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.3rc1 → truefoundry-0.5.3rc3}/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.3rc1 → truefoundry-0.5.3rc3}/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.3rc1 → truefoundry-0.5.3rc3}/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.3rc1 → truefoundry-0.5.3rc3}/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.3rc1 → truefoundry-0.5.3rc3}/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.3rc1 → truefoundry-0.5.3rc3}/truefoundry/cli/__main__.py

@@ -4,6 +4,7 @@ import sys
 import rich_click as click
 
 from truefoundry import logger
+from truefoundry.cli.commands.pat import get_generate_pat_command
 from truefoundry.cli.config import CliConfig
 from truefoundry.cli.const import GROUP_CLS
 from truefoundry.cli.util import setup_rich_click
@@ -21,6 +22,7 @@ from truefoundry.deploy.cli.commands import (
     get_terminate_command,
     get_trigger_command,
 )
+from truefoundry.gateway.cli.cli import get_gateway_cli
 from truefoundry.ml.cli.cli import get_ml_cli
 from truefoundry.version import __version__
 
@@ -88,6 +90,8 @@ def create_truefoundry_cli() -> click.MultiCommand:
     cli.add_command(get_trigger_command())
     cli.add_command(get_terminate_command())
     cli.add_command(get_ml_cli())
+    cli.add_command(get_gateway_cli())
+    cli.add_command(get_generate_pat_command())
 
     if not (sys.platform.startswith("win32") or sys.platform.startswith("cygwin")):
         cli.add_command(get_patch_command())

truefoundry-0.5.3rc3/truefoundry/cli/commands/pat.py

@@ -0,0 +1,24 @@
+import click
+
+from truefoundry.cli.console import console
+from truefoundry.cli.const import COMMAND_CLS
+from truefoundry.deploy.lib.clients.servicefoundry_client import (
+    ServiceFoundryServiceClient,
+)
+
+
+@click.command(cls=COMMAND_CLS, name="generate-api-key")
+@click.option(
+    "--name",
+    required=True,
+    help="Name for the API key",
+)
+def generate_pat(name: str):
+    """Generate a new Personal Access Token with specified name"""
+    client = ServiceFoundryServiceClient()
+    pat = client.create_pat(name)
+    console.print(pat)
+
+
+def get_generate_pat_command():
+    return generate_pat

{truefoundry-0.5.3rc1 → truefoundry-0.5.3rc3}/truefoundry/deploy/lib/clients/servicefoundry_client.py

@@ -4,7 +4,7 @@ import json
 import os
 import time
 from datetime import datetime, timezone
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
+from typing import TYPE_CHECKING, Any, Dict, List, Literal, Optional
 from urllib.parse import urljoin
 
 import requests
@@ -43,6 +43,7 @@ from truefoundry.deploy.v2.lib.models import (
     BuildResponse,
     DeploymentFqnResponse,
 )
+from truefoundry.gateway.lib.entities import ProviderModels
 from truefoundry.logger import logger
 from truefoundry.pydantic_v1 import parse_obj_as
 
@@ -708,3 +709,25 @@ class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
         )
         response_data = request_handling(response)
         return response_data
+
+    def get_gateway_models(
+        self, model_type: Optional[Literal["chat", "completion", "embedding"]] = None
+    ) -> ProviderModels:
+        url = f"{self._api_server_url}/{VERSION_PREFIX}/llm-gateway/model/enabled"
+        params = {}
+        if model_type:
+            params["modelType"] = model_type
+        response = session_with_retries().get(
+            url, headers=self._get_header(), params=params
+        )
+        response = request_handling(response)
+        return parse_obj_as(ProviderModels, response)
+
+    def create_pat(self, name: str):
+        url = f"{self._api_server_url}/{VERSION_PREFIX}/service-account/pat"
+        body = {"name": name}
+        response = session_with_retries().post(
+            url, headers=self._get_header(), json=body
+        )
+        response = request_handling(response)
+        return response

truefoundry-0.5.3rc3/truefoundry/gateway/__init__.py

@@ -0,0 +1 @@
+"""Gateway module for Truefoundry CLI"""

truefoundry-0.5.3rc3/truefoundry/gateway/cli/cli.py

@@ -0,0 +1,30 @@
+import click
+
+from truefoundry.cli.const import COMMAND_CLS, GROUP_CLS
+from truefoundry.cli.display_util import print_entity_list
+from truefoundry.gateway.lib.models import list_models
+
+
+def get_gateway_cli():
+    @click.group(cls=GROUP_CLS, help="Commands to interact with TrueFoundry Gateway")
+    def gateway(): ...
+
+    @gateway.group("list", cls=GROUP_CLS, help="List gateway resources")
+    def list_group():
+        """List gateway resources"""
+        pass
+
+    @list_group.command(
+        "models", cls=COMMAND_CLS, help="List available models filtered by type"
+    )
+    @click.option(
+        "--type",
+        "model_type",
+        type=click.Choice(["chat", "completion", "embedding"]),
+        help="Filter models by type",
+    )
+    def list_models_cli(model_type: str):
+        enabled_models = list_models(model_type)
+        print_entity_list("Models", enabled_models)
+
+    return gateway

truefoundry-0.5.3rc3/truefoundry/gateway/lib/entities.py

@@ -0,0 +1,28 @@
+from typing import Any, Dict, List, Optional, Union
+
+from truefoundry.pydantic_v1 import BaseModel
+
+
+class GatewayModel(BaseModel):
+    id: str
+    name: str
+    provider: str
+    model_id: Optional[str]
+    provider_account_name: str
+    tfy_application_id: Optional[str] = None
+    enabled: bool = True
+    types: Union[str, List[str]] = ""
+    created_by: str
+    tenant_name: str
+    model_fqn: str
+
+    def list_row_data(self) -> Dict[str, Any]:
+        return {
+            "model_id": self.model_fqn,
+            "provider": self.provider,
+            "provider_model_id": self.model_id,
+        }
+
+
+class ProviderModels(BaseModel):
+    __root__: Dict[str, Dict[str, List[GatewayModel]]]

truefoundry-0.5.3rc3/truefoundry/gateway/lib/models.py

@@ -0,0 +1,29 @@
+from typing import List, Literal, Optional
+
+from truefoundry.deploy.lib.clients.servicefoundry_client import (
+    ServiceFoundryServiceClient,
+)
+from truefoundry.gateway.lib.entities import GatewayModel
+
+
+def list_models(
+    model_type: Optional[Literal["chat", "completion", "embedding"]] = None,
+) -> List[GatewayModel]:
+    """List available models filtered by type
+
+    Args:
+        model_type (Optional[str], optional): Filter models by type ('chat' or 'completion'). Defaults to None.
+
+    Returns:
+        List: List of enabled models
+    """
+    client = ServiceFoundryServiceClient()
+    models = client.get_gateway_models(model_type)
+
+    enabled_models = []
+    for _, accounts in models.__root__.items():
+        for _, model_list in accounts.items():
+            for model in model_list:
+                enabled_models.append(model)
+
+    return enabled_models

{truefoundry-0.5.3rc1 → truefoundry-0.5.3rc3}/truefoundry/ml/autogen/client/__init__.py

@@ -184,6 +184,9 @@ from truefoundry.ml.autogen.client.models.finalize_artifact_version_request_dto
     FinalizeArtifactVersionRequestDto,
 )
 from truefoundry.ml.autogen.client.models.framework import Framework
+from truefoundry.ml.autogen.client.models.get_artifact_tags_response_dto import (
+    GetArtifactTagsResponseDto,
+)
 from truefoundry.ml.autogen.client.models.get_experiment_response_dto import (
     GetExperimentResponseDto,
 )

{truefoundry-0.5.3rc1 → truefoundry-0.5.3rc3}/truefoundry/ml/autogen/client/api/mlfoundry_artifacts_api.py

@@ -79,6 +79,9 @@ from truefoundry.ml.autogen.client.models.export_deployment_files_request_dto im
 from truefoundry.ml.autogen.client.models.finalize_artifact_version_request_dto import (
     FinalizeArtifactVersionRequestDto,
 )
+from truefoundry.ml.autogen.client.models.get_artifact_tags_response_dto import (
+    GetArtifactTagsResponseDto,
+)
 from truefoundry.ml.autogen.client.models.get_signed_url_for_dataset_write_request_dto import (
     GetSignedURLForDatasetWriteRequestDto,
 )
@@ -5338,6 +5341,150 @@ class MlfoundryArtifactsApi:
             _request_auth=_params.get("_request_auth"),
         )
 
+    @validate_arguments
+    def get_tags_for_artifact_get(
+        self, artifact_id: StrictStr, **kwargs
+    ) -> GetArtifactTagsResponseDto:  # noqa: E501
+        """Get Tags For Artifact  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+
+        >>> thread = api.get_tags_for_artifact_get(artifact_id, async_req=True)
+        >>> result = thread.get()
+
+        :param artifact_id: (required)
+        :type artifact_id: str
+        :param async_req: Whether to execute the request asynchronously.
+        :type async_req: bool, optional
+        :param _request_timeout: timeout setting for this request.
+               If one number provided, it will be total request
+               timeout. It can also be a pair (tuple) of
+               (connection, read) timeouts.
+        :return: Returns the result object.
+                 If the method is called asynchronously,
+                 returns the request thread.
+        :rtype: GetArtifactTagsResponseDto
+        """
+        kwargs["_return_http_data_only"] = True
+        if "_preload_content" in kwargs:
+            message = "Error! Please call the get_tags_for_artifact_get_with_http_info method with `_preload_content` instead and obtain raw data from ApiResponse.raw_data"  # noqa: E501
+            raise ValueError(message)
+        return self.get_tags_for_artifact_get_with_http_info(artifact_id, **kwargs)  # noqa: E501
+
+    @validate_arguments
+    def get_tags_for_artifact_get_with_http_info(
+        self, artifact_id: StrictStr, **kwargs
+    ) -> ApiResponse:  # noqa: E501
+        """Get Tags For Artifact  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+
+        >>> thread = api.get_tags_for_artifact_get_with_http_info(artifact_id, async_req=True)
+        >>> result = thread.get()
+
+        :param artifact_id: (required)
+        :type artifact_id: str
+        :param async_req: Whether to execute the request asynchronously.
+        :type async_req: bool, optional
+        :param _preload_content: if False, the ApiResponse.data will
+                                 be set to none and raw_data will store the
+                                 HTTP response body without reading/decoding.
+                                 Default is True.
+        :type _preload_content: bool, optional
+        :param _return_http_data_only: response data instead of ApiResponse
+                                       object with status code, headers, etc
+        :type _return_http_data_only: bool, optional
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
+        :type _content_type: string, optional: force content-type for the request
+        :return: Returns the result object.
+                 If the method is called asynchronously,
+                 returns the request thread.
+        :rtype: tuple(GetArtifactTagsResponseDto, status_code(int), headers(HTTPHeaderDict))
+        """
+
+        _params = locals()
+
+        _all_params = ["artifact_id"]
+        _all_params.extend(
+            [
+                "async_req",
+                "_return_http_data_only",
+                "_preload_content",
+                "_request_timeout",
+                "_request_auth",
+                "_content_type",
+                "_headers",
+            ]
+        )
+
+        # validate the arguments
+        for _key, _val in _params["kwargs"].items():
+            if _key not in _all_params:
+                raise ApiTypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method get_tags_for_artifact_get" % _key
+                )
+            _params[_key] = _val
+        del _params["kwargs"]
+
+        _collection_formats = {}
+
+        # process the path parameters
+        _path_params = {}
+
+        # process the query parameters
+        _query_params = []
+        if _params.get("artifact_id") is not None:  # noqa: E501
+            _query_params.append(("artifact_id", _params["artifact_id"]))
+
+        # process the header parameters
+        _header_params = dict(_params.get("_headers", {}))
+        # process the form parameters
+        _form_params = []
+        _files = {}
+        # process the body parameter
+        _body_params = None
+        # set the HTTP header `Accept`
+        _header_params["Accept"] = self.api_client.select_header_accept(
+            ["application/json"]
+        )  # noqa: E501
+
+        # authentication setting
+        _auth_settings = ["HTTPBearer", "APIKeyCookie"]  # noqa: E501
+
+        _response_types_map = {
+            "200": "GetArtifactTagsResponseDto",
+            "422": "HTTPValidationError",
+        }
+
+        return self.api_client.call_api(
+            "/api/2.0/mlflow/mlfoundry-artifacts/artifacts/get-tags",
+            "GET",
+            _path_params,
+            _query_params,
+            _header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            response_types_map=_response_types_map,
+            auth_settings=_auth_settings,
+            async_req=_params.get("async_req"),
+            _return_http_data_only=_params.get("_return_http_data_only"),  # noqa: E501
+            _preload_content=_params.get("_preload_content", True),
+            _request_timeout=_params.get("_request_timeout"),
+            collection_formats=_collection_formats,
+            _request_auth=_params.get("_request_auth"),
+        )
+
     @validate_arguments
     def list_artifact_versions_post(
         self,

{truefoundry-0.5.3rc1 → truefoundry-0.5.3rc3}/truefoundry/ml/autogen/client/models/__init__.py

@@ -155,6 +155,9 @@ from truefoundry.ml.autogen.client.models.finalize_artifact_version_request_dto
     FinalizeArtifactVersionRequestDto,
 )
 from truefoundry.ml.autogen.client.models.framework import Framework
+from truefoundry.ml.autogen.client.models.get_artifact_tags_response_dto import (
+    GetArtifactTagsResponseDto,
+)
 from truefoundry.ml.autogen.client.models.get_experiment_response_dto import (
     GetExperimentResponseDto,
 )

{truefoundry-0.5.3rc1 → truefoundry-0.5.3rc3}/truefoundry/ml/autogen/client/models/artifact_version_manifest.py

@@ -24,6 +24,7 @@ from truefoundry.pydantic_v1 import (
     Field,
     StrictStr,
     conint,
+    conlist,
     constr,
     validator,
 )
@@ -42,12 +43,16 @@ class ArtifactVersionManifest(BaseModel):
         default=...,
         description="+label=Metadata +docs=Metadata for the artifact or model version +usage=Metadata for the artifact or model version +uiType=JsonInput",
     )
+    tags: Optional[conlist(constr(strict=True, max_length=128))] = Field(
+        default=None,
+        description="+label=Tags +usage=Tags for the artifact or model version +docs=Tags for the artifact or model version",
+    )
     type: Optional[StrictStr] = "artifact-version"
     source: Source = Field(...)
     step: Optional[conint(strict=True, ge=0)] = Field(
         default=0, description="+label=Step"
     )
-    __properties = ["description", "metadata", "type", "source", "step"]
+    __properties = ["description", "metadata", "tags", "type", "source", "step"]
 
     @validator("type")
     def type_validate_enum(cls, value):
@@ -99,6 +104,7 @@ class ArtifactVersionManifest(BaseModel):
             {
                 "description": obj.get("description"),
                 "metadata": obj.get("metadata"),
+                "tags": obj.get("tags"),
                 "type": obj.get("type")
                 if obj.get("type") is not None
                 else "artifact-version",