truefoundry 0.4.4rc1__tar.gz → 0.4.4rc3__tar.gz

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

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

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

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

{truefoundry-0.4.4rc1 → truefoundry-0.4.4rc3}/truefoundry/deploy/builder/builders/tfy_notebook_buildpack/dockerfile_template.py

@@ -50,7 +50,7 @@ def generate_build_script_docker_commands(
     all_environment_variables = " ".join(environment_variables)
     run_build_script_command = f"""\
 COPY {build_script_path} /tmp/user-build-script.sh
-RUN {buildkit_secret_mounts} mkdir -p /var/log/ && {all_environment_variables} bash -ex /tmp/user-build-script.sh 2>&1 | tee /var/log/user-build-script-output.log
+RUN {buildkit_secret_mounts} mkdir -p /var/log/ && {all_environment_variables} bash -ex /tmp/user-build-script.sh 2>&1 | tee /var/log/user-build-script-output.log && test ${{PIPESTATUS[0]}} -eq 0
 """
     return run_build_script_command
 

{truefoundry-0.4.4rc1 → truefoundry-0.4.4rc3}/truefoundry/deploy/python_deploy_codegen.py

@@ -1,15 +1,16 @@
 import ast
 import io
+import json
 import re
-from typing import List
+from typing import Dict, List, Optional
 
 from rich.console import Console
 from rich.pretty import pprint
 
-from truefoundry.deploy import Application
+from truefoundry.deploy import Application, LocalSource
 
 
-def generate_code(
+def generate_deployment_code(
     symbols_to_import: List[str],
     application_type: str,
     spec_repr: str,
@@ -108,6 +109,13 @@ def convert_deployment_config_to_python(workspace_fqn: str, application_spec: di
     application = Application.parse_obj(application_spec)
     application_type = application.__root__.type
 
+    if (
+        hasattr(application.__root__, "image")
+        and application.__root__.image.type == "build"
+        and application.__root__.image.build_source.type == "remote"
+    ):
+        application.__root__.image.build_source = LocalSource(local_build=False)
+
     spec_repr = get_python_repr(application.__root__)
     spec_repr = replace_enums_with_values(spec_repr)
     spec_repr = remove_none_type_fields(spec_repr)
@@ -120,7 +128,7 @@ def convert_deployment_config_to_python(workspace_fqn: str, application_spec: di
     if "GitSource" in symbols_to_import:
         symbols_to_import.append("LocalSource")
 
-    generated_code = generate_code(
+    generated_code = generate_deployment_code(
         symbols_to_import=symbols_to_import,
         application_type=application_type,
         spec_repr=spec_repr,
@@ -131,3 +139,66 @@ def convert_deployment_config_to_python(workspace_fqn: str, application_spec: di
         generated_code = add_local_source_comment(generated_code)
 
     return generated_code
+
+
+def generate_python_snippet_for_trigger_job(
+    application_fqn: str, command: Optional[str], params: Optional[Dict[str, str]]
+):
+    job_run_python_template = """from truefoundry.deploy import trigger_job
+
+response = trigger_job(
+  application_fqn="{{application_fqn}}",
+  # You can pass command or params, but not both
+  # command={{command}}
+  # params={{params}}
+)
+
+print(response.jobRunName)
+"""
+    output_python_str = job_run_python_template.replace(
+        "{{application_fqn}}", application_fqn
+    )
+
+    if command is not None:
+        output_python_str = output_python_str.replace("{{command}}", repr(command))
+        output_python_str = output_python_str.replace("# command", "command")
+    else:
+        output_python_str = output_python_str.replace(
+            "{{command}}", "<Enter Command Here>"
+        )
+
+    if params is not None:
+        output_python_str = output_python_str.replace("{{params}}", repr(params))
+        output_python_str = output_python_str.replace("# params", "params")
+    else:
+        output_python_str = output_python_str.replace(
+            "{{params}}", "<Enter Params(key-value pairs) here as python dict>"
+        )
+
+    return output_python_str
+
+
+def generate_curl_snippet_for_trigger_job(
+    control_plane_url: str,
+    application_id: str,
+    command: Optional[str],
+    params: Optional[Dict[str, str]],
+):
+    job_run_curl_request_template = """curl -X 'POST' \\
+  '{{control_plane_url}}/api/svc/v1/jobs/trigger' \\
+  -H 'accept: */*' \\
+  -H 'Authorization: Bearer <Paste your API key here. You can generate it from the Settings Page>' \\
+  -H 'Content-Type: application/json' \\
+  -d '{
+  "applicationId": "{{application_id}}",
+  "input": {{input}}
+}'
+"""
+    output_curl_str = job_run_curl_request_template.replace(
+        "{{control_plane_url}}", control_plane_url
+    )
+    output_curl_str = output_curl_str.replace("{{application_id}}", application_id)
+    output_curl_str = output_curl_str.replace(
+        "{{input}}", json.dumps({"command": command, "params": params}, indent=2)
+    )
+    return output_curl_str