truefoundry 0.6.3rc3__py3-none-any.whl → 0.6.4__py3-none-any.whl

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/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/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/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/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": parameters,
+    }

{truefoundry-0.6.3rc3.dist-info → truefoundry-0.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truefoundry
-Version: 0.6.3rc3
+Version: 0.6.4
 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.dist-info → truefoundry-0.6.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-truefoundry/__init__.py,sha256=eRH4vd0dZTwSLl91MZ99yhI9b-lcC_XQQZRxN-srzms,703
+truefoundry/__init__.py,sha256=_Ty6ohIytSuJfQDEC7mCKW0aBEb6bAI2pRDi01haAnU,778
 truefoundry/_client.py,sha256=Y3qHi_Lg4Sx6GNvsjAHIoAfFr8PJnqgCrXmpNAI3ECg,1417
 truefoundry/logger.py,sha256=u-YCNjg5HBwE70uQcpjIG64Ghos-K2ulTWaxC03BSj4,714
 truefoundry/pydantic_v1.py,sha256=jSuhGtz0Mbk1qYu8jJ1AcnIDK4oxUsdhALc4spqstmM,345
@@ -48,9 +48,9 @@ truefoundry/common/storage_provider_utils.py,sha256=yURhMw8k0FLFvaviRHDiifhvc6Gn
 truefoundry/common/types.py,sha256=BMJFCsR1lPJAw66IQBSvLyV4I6o_x5oj78gVsUa9si8,188
 truefoundry/common/utils.py,sha256=yEQtJW2fT9xbNpRhfRoD9hvhGw-FgGS3agh1oZptmjg,6379
 truefoundry/common/warnings.py,sha256=rs6BHwk7imQYedo07iwh3TWEOywAR3Lqhj0AY4khByg,504
-truefoundry/deploy/__init__.py,sha256=zNsyzJAOPCPqlhVEEq6sBpfPsa4XkChaXvE-EBCmfzs,2645
+truefoundry/deploy/__init__.py,sha256=SkkhHRP1qOeQb1XYRiTKKjA0uDm8YEbdDEPUN4rvY1w,2732
 truefoundry/deploy/python_deploy_codegen.py,sha256=AainOFR20XvhNeztJkLPWGZ40lAT_nwc-ZmG77Kum4o,6525
-truefoundry/deploy/_autogen/models.py,sha256=0m43YJVG0fBhLp0fPkCod_vIcMFob0jTQEGnjk6nOUQ,69804
+truefoundry/deploy/_autogen/models.py,sha256=rypFsppVuXJJOhFwYAS65Ef3OyIPTkBIod9DXoDwOwY,70918
 truefoundry/deploy/builder/__init__.py,sha256=nGQiR3r16iumRy7xbVQ6q-k0EApmijspsfVpXDE-9po,4953
 truefoundry/deploy/builder/constants.py,sha256=amUkHoHvVKzGv0v_knfiioRuKiJM0V0xW0diERgWiI0,508
 truefoundry/deploy/builder/docker_service.py,sha256=sm7GWeIqyrKaZpxskdLejZlsxcZnM3BTDJr6orvPN4E,3948
@@ -108,7 +108,7 @@ truefoundry/deploy/v2/lib/deploy.py,sha256=FWmqX4N6RUN4-S68i-7xaIifYWnf0wc-zfINd
 truefoundry/deploy/v2/lib/deploy_workflow.py,sha256=G5BzMIbap8pgDX1eY-TITruUxQdkKhYtBmRwLL6lDeY,14342
 truefoundry/deploy/v2/lib/deployable_patched_models.py,sha256=xbHFD3pURflvCm8EODPvjfvRrv67mlSrjPUknY8SMB8,4060
 truefoundry/deploy/v2/lib/models.py,sha256=ogc1UYs1Z2nBdGSKCrde9sk8d0GxFKMkem99uqO5CmM,1148
-truefoundry/deploy/v2/lib/patched_models.py,sha256=vVjYs1Gm7mpuTx3C0l40RQ_zvMdQ1S0s6J-f00qO0nA,16557
+truefoundry/deploy/v2/lib/patched_models.py,sha256=xlgFust2rSnPfQcSe2SW0Sl4gShvZnZNf1UFKjUkPI0,16917
 truefoundry/deploy/v2/lib/source.py,sha256=d6-8_6Zn5koBglqrBrY6ZLG_7yyPuLdyEmK4iZTw6xY,9405
 truefoundry/ml/__init__.py,sha256=EEEHV7w58Krpo_W9Chd8Y3TdItfFO3LI6j6Izqc4-P8,2219
 truefoundry/ml/constants.py,sha256=vDq72d4C9FSWqr9MMdjgTF4TuyNFApvo_6RVsSeAjB4,2837
@@ -121,6 +121,7 @@ truefoundry/ml/logger.py,sha256=VT-BF3BnBYTWVq87O58F0c8uXMu94gYzsiFlGY3_7Ao,458
 truefoundry/ml/mlfoundry_api.py,sha256=WiIVpJRylBn8NrcAmXClQnavffqI9fhY5h-8Vwx4RKo,59872
 truefoundry/ml/mlfoundry_run.py,sha256=34yyQqgpG6EfrAJd37vkbCjrFoHkhvbOAxxSQcSWPtY,44320
 truefoundry/ml/model_framework.py,sha256=nVbKTtKDRBdLzt7Wrg5_vJKZ-awHbISGvL73s-V9egU,18975
+truefoundry/ml/prompt_utils.py,sha256=K5CnHKcxciHD20gtxAvuGAoLc08NwjOB5gxDvlkroxc,2470
 truefoundry/ml/run_utils.py,sha256=0W208wSLUrbdfk2pjNcZlkUi9bNxG2JORqoe-5rVqHI,2423
 truefoundry/ml/session.py,sha256=2v8JjFyrcKzKQ8qsTaZaQTqlxl-in9odIMyWWMEqWNY,4436
 truefoundry/ml/validation_utils.py,sha256=rmIBNcpmnwq2jeje6uFg8uY-rL4JG_RV6mc6BlujVWg,12150
@@ -371,7 +372,7 @@ truefoundry/workflow/remote_filesystem/__init__.py,sha256=LQ95ViEjJ7Ts4JcCGOxMPs
 truefoundry/workflow/remote_filesystem/logger.py,sha256=em2l7D6sw7xTLDP0kQSLpgfRRCLpN14Qw85TN7ujQcE,1022
 truefoundry/workflow/remote_filesystem/tfy_signed_url_client.py,sha256=xcT0wQmQlgzcj0nP3tJopyFSVWT1uv3nhiTIuwfXYeg,12342
 truefoundry/workflow/remote_filesystem/tfy_signed_url_fs.py,sha256=nSGPZu0Gyd_jz0KsEE-7w_BmnTD8CVF1S8cUJoxaCbc,13305
-truefoundry-0.6.3rc3.dist-info/METADATA,sha256=8e9-fba9S4VCR0DjKElwUVf4lKqOaZ15Ua-f4N6jKU8,2352
-truefoundry-0.6.3rc3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truefoundry-0.6.3rc3.dist-info/entry_points.txt,sha256=xVjn7RMN-MW2-9f7YU-bBdlZSvvrwzhpX1zmmRmsNPU,98
-truefoundry-0.6.3rc3.dist-info/RECORD,,
+truefoundry-0.6.4.dist-info/METADATA,sha256=Zlf3TokDrDXPIDuTfabZ5A9jv6fegUeVYE3bntGuaaU,2350
+truefoundry-0.6.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truefoundry-0.6.4.dist-info/entry_points.txt,sha256=xVjn7RMN-MW2-9f7YU-bBdlZSvvrwzhpX1zmmRmsNPU,98
+truefoundry-0.6.4.dist-info/RECORD,,