truefoundry 0.10.4rc2__py3-none-any.whl → 0.10.4rc4__py3-none-any.whl

truefoundry/deploy/python_deploy_codegen.py

@@ -2,7 +2,7 @@ import ast
 import io
 import json
 import re
-from typing import Dict, List, Optional
+from typing import Any, Callable, Dict, List, Optional
 
 from rich.console import Console
 from rich.pretty import pprint
@@ -17,7 +17,7 @@ def generate_deployment_code(
     spec_repr: str,
     workspace_fqn: str,
 ):
-    symbols = ",".join(symbols_to_import)
+    symbols = ", ".join(symbols_to_import)
     application_type = application_type.replace(" ", "").replace("-", "_")
     code = f"""\
 import logging
@@ -72,7 +72,7 @@ def remove_none_type_fields(code):
 
 def remove_type_field(code):
     lines = code.split("\n")
-    new_lines = [re.sub(r'^[ \t]*type=[\'"][^"]*[\'"],', "", line) for line in lines]
+    new_lines = [re.sub(r'^[ \t]*type=[\'"][^"]*[\'"],?', "", line) for line in lines]
     return "\n".join(new_lines)
 
 
@@ -143,15 +143,39 @@ def _convert_deployment_config_to_python(workspace_fqn: str, application_spec: d
     return generated_code
 
 
-def convert_deployment_config_to_python(workspace_fqn: str, application_spec: dict):
+def _default_exclude_fn(model: BaseModel, name: str) -> bool:
+    return False
+
+
+def convert_deployment_config_to_python(
+    workspace_fqn: str,
+    application_spec: Dict[str, Any],
+    exclude_fn: Callable[[BaseModel, str], bool] = _default_exclude_fn,
+    exclude_unset: bool = False,
+    exclude_defaults: bool = False,
+):
     original_repr_args = BaseModel.__repr_args__
 
     def _patched_repr_args(self: BaseModel):
-        return [
-            (name, value)
-            for name, value in original_repr_args(self)
-            if name in self.__fields_set__
-        ]
+        _missing = object()
+        pairs = []
+        for name, value in original_repr_args(self):
+            if name is not None:
+                if exclude_fn(self, name):
+                    continue
+                if exclude_unset and name not in self.__fields_set__:
+                    continue
+                model_field = self.__fields__.get(name)
+                if model_field is None:
+                    continue
+                if (
+                    exclude_defaults
+                    and not getattr(model_field, "required", True)
+                    and getattr(model_field, "default", _missing) == value
+                ):
+                    continue
+            pairs.append((name, value))
+        return pairs
 
     try:
         BaseModel.__repr_args__ = _patched_repr_args

{truefoundry-0.10.4rc2.dist-info → truefoundry-0.10.4rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truefoundry
-Version: 0.10.4rc2
+Version: 0.10.4rc4
 Summary: TrueFoundry CLI
 Author-email: TrueFoundry Team <abhishek@truefoundry.com>
 Requires-Python: <3.14,>=3.8.1

{truefoundry-0.10.4rc2.dist-info → truefoundry-0.10.4rc4.dist-info}/RECORD

@@ -53,7 +53,7 @@ truefoundry/common/types.py,sha256=BMJFCsR1lPJAw66IQBSvLyV4I6o_x5oj78gVsUa9si8,1
 truefoundry/common/utils.py,sha256=j3QP0uOsaGD_VmDDR68JTwoYE1okkAq6OqpVkzVf48Q,6424
 truefoundry/common/warnings.py,sha256=rs6BHwk7imQYedo07iwh3TWEOywAR3Lqhj0AY4khByg,504
 truefoundry/deploy/__init__.py,sha256=2GNbI8IGJBotz_IKaqQ-DWYWZn_pSu7lN7aId15Gk7Q,2799
-truefoundry/deploy/python_deploy_codegen.py,sha256=CNL1633k84Mg4hUk2azc88TrQwRWEON0f2Y8V3SGuoM,7173
+truefoundry/deploy/python_deploy_codegen.py,sha256=k19_m5DGsUyjOUCSKwIVP8vDna2sq01tHABsUfoVpW4,8019
 truefoundry/deploy/_autogen/models.py,sha256=xt-DuaRDx5jeRwyGoQH2yyPZAep9Q2MHFW9XBuRzG8E,73161
 truefoundry/deploy/builder/__init__.py,sha256=kgvlkVkiWpMVdim81tIeLrdoACqrFDgwCqHdQVsCsMo,4988
 truefoundry/deploy/builder/constants.py,sha256=amUkHoHvVKzGv0v_knfiioRuKiJM0V0xW0diERgWiI0,508
@@ -381,7 +381,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.10.4rc2.dist-info/METADATA,sha256=SJpxZlTvIDJc5NOKQZdbj-K4z1tv0Dqct9vdAwYuKYw,2508
-truefoundry-0.10.4rc2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truefoundry-0.10.4rc2.dist-info/entry_points.txt,sha256=xVjn7RMN-MW2-9f7YU-bBdlZSvvrwzhpX1zmmRmsNPU,98
-truefoundry-0.10.4rc2.dist-info/RECORD,,
+truefoundry-0.10.4rc4.dist-info/METADATA,sha256=5AJCpFRmPJFEZb9YerIsMFvC5Dq_Sr3YJPJlh3Ea3IQ,2508
+truefoundry-0.10.4rc4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truefoundry-0.10.4rc4.dist-info/entry_points.txt,sha256=xVjn7RMN-MW2-9f7YU-bBdlZSvvrwzhpX1zmmRmsNPU,98
+truefoundry-0.10.4rc4.dist-info/RECORD,,