truefoundry 0.6.3rc3__tar.gz → 0.6.5__tar.gz

{truefoundry-0.6.3rc3 → truefoundry-0.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truefoundry
-Version: 0.6.3rc3
+Version: 0.6.5
 Summary: TrueFoundry CLI
 Author-email: TrueFoundry Team <abhishek@truefoundry.com>
 Requires-Python: <3.14,>=3.8.1
@@ -30,7 +30,7 @@ Requires-Dist: requirements-parser<0.12.0,>=0.11.0
 Requires-Dist: rich-click<2.0.0,>=1.2.1
 Requires-Dist: rich<14.0.0,>=13.7.1
 Requires-Dist: tqdm<5.0.0,>=4.0.0
-Requires-Dist: truefoundry-sdk==0.0.8
+Requires-Dist: truefoundry-sdk==0.0.10
 Requires-Dist: typing-extensions>=4.0
 Requires-Dist: urllib3<3,>=1.26.18
 Requires-Dist: yq<4.0.0,>=3.1.0

{truefoundry-0.6.3rc3 → truefoundry-0.6.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "truefoundry"
-version = "0.6.3rc3"  # This is a placeholder version, it will be replaced when releasing
+version = "0.6.5"  # This is a placeholder version, it will be replaced when releasing
 requires-python = ">=3.8.1,<3.14"
 description = "TrueFoundry CLI"
 authors = [{ name = "TrueFoundry Team", email = "abhishek@truefoundry.com" }]
@@ -31,7 +31,7 @@ dependencies = [
   "rich>=13.7.1,<14.0.0",
   "rich-click>=1.2.1,<2.0.0",
   "tqdm>=4.0.0,<5.0.0",
-  "truefoundry-sdk==0.0.8",
+  "truefoundry-sdk==0.0.10",
   "typing-extensions>=4.0",
   "urllib3>=1.26.18,<3",
   "yq>=3.1.0,<4.0.0",

{truefoundry-0.6.3rc3 → truefoundry-0.6.5}/truefoundry/__init__.py

@@ -14,6 +14,7 @@ from truefoundry.common.warnings import (
     surface_truefoundry_deprecation_warnings,
 )
 from truefoundry.deploy.core import login, logout
+from truefoundry.ml.prompt_utils import render_prompt
 
 surface_truefoundry_deprecation_warnings()
 __all__ = [
@@ -25,6 +26,7 @@ __all__ = [
     "ModelConfiguration",
     "Parameters",
     "PromptVersion",
+    "render_prompt",
     "suppress_truefoundry_deprecation_warnings",
     "SystemMessage",
     "UserMessage",

{truefoundry-0.6.3rc3 → truefoundry-0.6.5}/truefoundry/deploy/__init__.py

@@ -112,6 +112,9 @@ from truefoundry.deploy.v2.lib.patched_models import (
     SecretMount,
     ServiceAutoscaling,
     SlackWebhook,
+    SparkJobJavaEntrypoint,
+    SparkJobPythonEntrypoint,
+    SparkJobScalaEntrypoint,
     SQSInputConfig,
     SQSOutputConfig,
     SQSQueueMetricConfig,

{truefoundry-0.6.3rc3 → truefoundry-0.6.5}/truefoundry/deploy/_autogen/models.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  application.json
-#   timestamp: 2025-03-27T11:40:57+00:00
+#   timestamp: 2025-04-07T11:22:45+00:00
 
 from __future__ import annotations
 
@@ -282,9 +282,9 @@ class GitSource(BaseModel):
     """
 
     type: Literal["git"] = Field(..., description="")
-    repo_url: constr(
-        regex=r"^(http(s?)://)(github\.com|(.+@)*bitbucket\.org|gitlab\.com|(.*)@dev.azure.com).*$"
-    ) = Field(..., description="The repository URL.")
+    repo_url: constr(regex=r"^(https?://)\S+$") = Field(
+        ..., description="The repository URL."
+    )
     ref: str = Field(..., description="The commit SHA.")
     branch_name: Optional[str] = Field(
         None,
@@ -856,6 +856,42 @@ class SparkExecutorFixedInstances(BaseModel):
     count: conint(ge=0, le=500) = Field(1, description="Number of instances to start")
 
 
+class SparkJobJavaEntrypoint(BaseModel):
+    type: Literal["java"] = Field(..., description="")
+    main_application_file: str = Field(
+        ..., description="The main application file to be executed by the spark job."
+    )
+    main_class: str = Field(
+        ..., description="The main class to be executed by the spark job."
+    )
+    arguments: Optional[str] = Field(
+        None, description="Arguments to be passed to the main application file."
+    )
+
+
+class SparkJobPythonEntrypoint(BaseModel):
+    type: Literal["python"] = Field(..., description="")
+    main_application_file: str = Field(
+        ..., description="The main application file to be executed by the spark job."
+    )
+    arguments: Optional[str] = Field(
+        None, description="Arguments to be passed to the main application file."
+    )
+
+
+class SparkJobScalaEntrypoint(BaseModel):
+    type: Literal["scala"] = Field(..., description="")
+    main_application_file: str = Field(
+        ..., description="The main application file to be executed by the spark job."
+    )
+    main_class: str = Field(
+        ..., description="The main class to be executed by the spark job."
+    )
+    arguments: Optional[str] = Field(
+        None, description="Arguments to be passed to the main application file."
+    )
+
+
 class StaticVolumeConfig(BaseModel):
     type: Literal["static"] = Field(..., description="Volume Type for the volume.")
     persistent_volume_name: str = Field(
@@ -1349,24 +1385,21 @@ class SparkJob(BaseModel):
     name: constr(regex=r"^[a-z](?:[a-z0-9]|-(?!-)){1,30}[a-z0-9]$") = Field(
         ..., description="Name of the job"
     )
+    entrypoint: Union[
+        SparkJobPythonEntrypoint, SparkJobScalaEntrypoint, SparkJobJavaEntrypoint
+    ] = Field(..., description="")
     image: Image
     spark_version: str = Field(
         "3.5.2",
         description="Spark version should match the spark version installed in the image.",
     )
-    main_application_file: str = Field(
-        ..., description="The main application file to be executed by the spark job."
-    )
-    arguments: Optional[str] = Field(
-        None, description="Arguments to be passed to the main application file."
-    )
     driver_config: SparkDriverConfig
     executor_config: SparkExecutorConfig
     env: Optional[Dict[str, Any]] = Field(
         None,
         description="Configure environment variables to be injected in the service either as plain text. [Docs](https://docs.truefoundry.com/docs/env-variables)",
     )
-    conf: Optional[Dict[str, Any]] = Field(
+    spark_conf: Optional[Dict[str, Any]] = Field(
         None,
         description="Extra configuration properties to be passed to the spark job. [Docs](https://spark.apache.org/docs/latest/configuration.html)",
     )

{truefoundry-0.6.3rc3 → truefoundry-0.6.5}/truefoundry/deploy/v2/lib/patched_models.py

@@ -571,3 +571,15 @@ class Email(models.Email, PatchedModelBase):
 
 class SlackWebhook(models.SlackWebhook, PatchedModelBase):
     type: Literal["slack-webhook"] = "slack-webhook"
+
+
+class SparkJobScalaEntrypoint(models.SparkJobScalaEntrypoint, PatchedModelBase):
+    type: Literal["scala"] = "scala"
+
+
+class SparkJobPythonEntrypoint(models.SparkJobPythonEntrypoint, PatchedModelBase):
+    type: Literal["python"] = "python"
+
+
+class SparkJobJavaEntrypoint(models.SparkJobJavaEntrypoint, PatchedModelBase):
+    type: Literal["java"] = "java"

truefoundry-0.6.5/truefoundry/ml/prompt_utils.py

@@ -0,0 +1,65 @@
+import re
+from typing import Any, Dict, Optional
+
+from truefoundry_sdk import ChatPromptManifest
+
+_VAR_PATTERN = re.compile(r"\{\{(\w+)\}\}")
+
+
+def render_text(template: str, variables: Dict[str, str]) -> str:
+    return _VAR_PATTERN.sub(
+        lambda m: (variables.get(m.group(1), f"{{{{{m.group(1)}}}}}")), template
+    )
+
+
+def render_prompt(
+    prompt_template: ChatPromptManifest, variables: Optional[Dict[str, str]] = None
+) -> Dict[str, Any]:
+    """
+    Renders a prompt template with the provided variables.
+    Args:
+        prompt_template (ChatPromptManifest): The prompt template to render.
+        variables (Optional[Dict[str, str]]): A dictionary of variables to replace in the template.
+            If None, the default variables from the prompt template will be used.
+
+    Returns:
+        Dict[str, Any]: A dictionary containing the rendered messages and model configuration.
+
+    """
+    # Render the messages in the prompt template with the provided variables and default variables
+    rendered_messages = []
+    variables = {**(prompt_template.variables or {}), **(variables or {})}
+    messages = [message.copy(deep=True) for message in prompt_template.messages]
+
+    # Render the messages with the provided variables, if any
+    if variables:
+        for msg in messages:
+            if isinstance(msg.content, str):
+                msg.content = render_text(template=msg.content, variables=variables)
+            elif isinstance(msg.content, list):
+                for part in msg.content:
+                    if part.type == "image_url" and isinstance(part.image_url.url, str):
+                        part.image_url.url = render_text(
+                            part.image_url.url, variables=variables
+                        )
+                    elif part.type == "text" and isinstance(part.text, str):
+                        part.text = render_text(part.text, variables=variables)
+
+    rendered_messages = [message.dict() for message in messages]
+
+    # Merge parameters from model_configuration and extra_parameters
+    model_configuration = prompt_template.model_configuration
+    parameters = {
+        **(
+            model_configuration.parameters.dict()
+            if model_configuration.parameters
+            else {}
+        ),
+        **(model_configuration.extra_parameters or {}),
+    }
+
+    return {
+        "messages": rendered_messages,
+        "model": model_configuration.model,
+        "parameters": {k: v for k, v in parameters.items() if v is not None},
+    }