truefoundry 0.5.3rc3__tar.gz → 0.5.3rc4__tar.gz

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

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

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

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

{truefoundry-0.5.3rc3 → 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.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.3rc3 → truefoundry-0.5.3rc4}/truefoundry/gateway/lib/entities.py

@@ -17,10 +17,15 @@ class GatewayModel(BaseModel):
     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_id": self.model_fqn,
-            "provider": self.provider,
-            "provider_model_id": self.model_id,
+            "model": model_display,
+            "provider": provider_display,
+            "type": self.types if isinstance(self.types, str) else ", ".join(self.types)
         }
 
 

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"

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

@@ -1,30 +0,0 @@
-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/models.py

@@ -1,29 +0,0 @@
-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