truefoundry 0.5.3rc2__tar.gz → 0.5.3rc4__tar.gz

{truefoundry-0.5.3rc2 → truefoundry-0.5.3rc4}/PKG-INFO

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

{truefoundry-0.5.3rc2 → truefoundry-0.5.3rc4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "truefoundry"
-version = "0.5.3rc2"
+version = "0.5.3rc4"
 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.3rc2 → truefoundry-0.5.3rc4}/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.3rc2 → truefoundry-0.5.3rc4}/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.3rc2 → truefoundry-0.5.3rc4}/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.3rc2 → truefoundry-0.5.3rc4}/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.3rc2 → truefoundry-0.5.3rc4}/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.3rc2 → truefoundry-0.5.3rc4}/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.3rc2 → truefoundry-0.5.3rc4}/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.3rc2 → truefoundry-0.5.3rc4}/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.3rc2 → truefoundry-0.5.3rc4}/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.3rc2 → truefoundry-0.5.3rc4}/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.3rc2 → truefoundry-0.5.3rc4}/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.3rc2 → truefoundry-0.5.3rc4}/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.3rc2 → truefoundry-0.5.3rc4}/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.3rc2 → truefoundry-0.5.3rc4}/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.3rc4/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.3rc2 → truefoundry-0.5.3rc4}/truefoundry/common/constants.py

@@ -63,3 +63,4 @@ API_SERVER_RELATIVE_PATH = "api/svc"
 MLFOUNDRY_SERVER_RELATIVE_PATH = "api/ml"
 VERSION_PREFIX = "v1"
 SERVICEFOUNDRY_CLIENT_MAX_RETRIES = 2
+GATEWAY_SERVER_RELATIVE_PATH = "api/llm"

{truefoundry-0.5.3rc2 → truefoundry-0.5.3rc4}/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.3rc4/truefoundry/gateway/__init__.py

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

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

@@ -0,0 +1,51 @@
+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 generate_code_for_model, 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)
+
+    @gateway.command("generate-code", cls=COMMAND_CLS, help="Generate code for a model")
+    @click.argument("model_id")
+    @click.option(
+        "--inference-type",
+        type=click.Choice(["chat", "completion", "embedding"]),
+        default="chat",
+        help="Type of inference to generate code for",
+    )
+    @click.option(
+        "--client",
+        type=click.Choice(["openai", "rest", "langchain", "stream", "node", "curl"]),
+        default="curl",
+        help="Language/framework to generate code for",
+    )
+    def generate_code_cli(model_id: str, inference_type: str, client: str):
+        """Generate code for a model"""
+        code = generate_code_for_model(
+            model_id, client=client, inference_type=inference_type
+        )
+        print(code)
+
+    return gateway

truefoundry-0.5.3rc4/truefoundry/gateway/lib/client.py

@@ -0,0 +1,51 @@
+from typing import Literal, Optional
+
+import requests
+
+from truefoundry.common.constants import GATEWAY_SERVER_RELATIVE_PATH
+from truefoundry.common.credential_provider import (
+    CredentialProvider,
+    EnvCredentialProvider,
+    FileCredentialProvider,
+)
+
+
+class GatewayServiceClient:
+    def __init__(
+        self,
+        credential_provider: Optional[CredentialProvider] = None,
+        host: Optional[str] = None,
+    ) -> None:
+        if credential_provider is None:
+            if EnvCredentialProvider.can_provide():
+                credential_provider = EnvCredentialProvider()
+            elif FileCredentialProvider.can_provide():
+                credential_provider = FileCredentialProvider()
+            else:
+                raise Exception(
+                    "No credentials found. Please login using `tfy login` or set TFY_API_KEY environment variable"
+                )
+
+        self._credential_provider = credential_provider
+        self._host = credential_provider.base_url
+
+    def _get_header(self):
+        return {
+            "Authorization": f"Bearer {self._credential_provider.token.access_token}"
+        }
+
+    @property
+    def _base_url(self) -> str:
+        return f"{self._host}/{GATEWAY_SERVER_RELATIVE_PATH}"
+
+    def generate_code(
+        self, model_id: str, inference_type: Literal["chat", "completion", "embedding"]
+    ) -> str:
+        url = f"{self._base_url}/api/inference/openai/generate-code-snippet"
+        data = {
+            "model": model_id,
+            "playground_endpoint": self._base_url,
+            "inference_type": inference_type,
+        }
+        response = requests.post(url, headers=self._get_header(), json=data)
+        return response.json()

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

@@ -0,0 +1,33 @@
+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]:
+        model_display = self.model_fqn
+        provider_display = self.provider
+        if self.model_id:
+            provider_display = f"{self.provider} ({self.model_id})"
+        
+        return {
+            "model": model_display,
+            "provider": provider_display,
+            "type": self.types if isinstance(self.types, str) else ", ".join(self.types)
+        }
+
+
+class ProviderModels(BaseModel):
+    __root__: Dict[str, Dict[str, List[GatewayModel]]]

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

@@ -0,0 +1,67 @@
+from typing import List, Literal, Optional
+
+from truefoundry.deploy.lib.clients.servicefoundry_client import (
+    ServiceFoundryServiceClient,
+)
+from truefoundry.gateway.lib.client import GatewayServiceClient
+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
+
+
+def generate_code_for_model(
+    model_id: str,
+    client: Literal["openai", "rest", "langchain", "stream", "node", "curl"] = "curl",
+    inference_type: Literal["chat", "completion", "embedding"] = "chat",
+) -> str:
+    """Generate code snippet for using a model in the specified language/framework
+
+    Args:
+        model_id (str): ID of the model to generate code for
+        language (Literal["openai", "rest", "langchain", "stream", "node", "curl"]): Language/framework to generate code for. Defaults to "curl"
+        inference_type (Literal["chat", "completion", "embedding"]): Type of inference to generate code for. Defaults to "chat"
+
+    Returns:
+        str: Code snippet for using the model in the specified language/framework
+    """
+    gateway_client = GatewayServiceClient()
+    response = gateway_client.generate_code(model_id, inference_type)
+
+    code_map = {
+        "openai": ("openai_code", "Python code using OpenAI SDK for direct API calls"),
+        "rest": ("rest_code", "Python code using requests library for REST API calls"),
+        "langchain": (
+            "langchain_code",
+            "Python code using LangChain framework for LLM integration",
+        ),
+        "stream": ("stream_code", "Python code with streaming response handling"),
+        "node": ("node_code", "Node.js code using Axios for API calls"),
+        "curl": ("curl_code", "cURL command for direct API access via terminal"),
+    }
+
+    code_key, description = code_map[client]
+    if code_key in response and response[code_key]:
+        return f"{description}\n{response[code_key]}"
+
+    return "No code snippet available for the specified language"