machineconfig 6.73__py3-none-any.whl → 6.74__py3-none-any.whl

machineconfig/utils/meta.py

@@ -4,7 +4,7 @@ from collections.abc import Callable
 from typing import Any
 
 
-def get_import_module_string(py_file: str):
+def get_import_module_string(py_file: str) -> str:
     from machineconfig.scripts.python.helpers_fire.helpers4 import get_import_module_code
     from machineconfig.utils.accessories import get_repo_root
     from pathlib import Path
@@ -111,7 +111,7 @@ def lambda_to_python_script(lmb: Callable[[], Any], in_global: bool, import_modu
         import_prefix = get_import_module_string(str(_Path(module_path_candidate)))
 
     # Evaluate each keyword argument value in the lambda's globals to get real Python objects
-    call_kwargs = {}
+    call_kwargs: dict[str, Any] = {}
     for kw in body.keywords:
         if kw.arg is None:
             # **kwargs in call — evaluate to dict and merge
@@ -135,7 +135,6 @@ def lambda_to_python_script(lmb: Callable[[], Any], in_global: bool, import_modu
         orig_src = _inspect.getsource(func_obj)
         ded = _textwrap.dedent(orig_src)
         lines = ded.splitlines()
-        # find the line that starts with def <name>(
         def_index = None
         for i, ln in enumerate(lines):
             if ln.lstrip().startswith(f"def {func_name}("):
@@ -144,19 +143,30 @@ def lambda_to_python_script(lmb: Callable[[], Any], in_global: bool, import_modu
         if def_index is None:
             body_lines = ded.splitlines()
         else:
-            body_lines = lines[def_index + 1 :]
+            signature_end_index = None
+            for i in range(def_index, len(lines)):
+                line_no_comment = lines[i].split("#", 1)[0].rstrip()
+                if line_no_comment.endswith(":"):
+                    signature_end_index = i
+                    break
+            if signature_end_index is None:
+                body_lines = lines[def_index + 1 :]
+            else:
+                body_lines = lines[signature_end_index + 1 :]
         # ensure we have a body, otherwise use pass
         if not any(line.strip() for line in body_lines):
             body_text = "    pass\n"
         else:
-            # keep the dedented body lines exactly as-is (they should be indented)
-            body_text = "\n".join(body_lines) + ("\n" if not body_lines[-1].endswith("\n") else "")
+            joined_body = "\n".join(body_lines)
+            if not joined_body.endswith("\n"):
+                joined_body = f"{joined_body}\n"
+            body_text = joined_body
     except (OSError, IOError, TypeError):
         body_text = "    pass\n"
 
     # Build a replaced signature using inspect.signature
     sig = _inspect.signature(func_obj)
-    new_params = []
+    new_params: list[_inspect.Parameter] = []
     for name, param in sig.parameters.items():
         # If the call provided a value for this parameter, replace default
         if name in call_kwargs:
@@ -217,7 +227,7 @@ def lambda_to_python_script(lmb: Callable[[], Any], in_global: bool, import_modu
 
     if import_prefix:
         return f"{import_prefix}{result_text}"
-    return result_text
+    return f"""from typing import Optional, Any, Literal""" + "\n" + result_text
 
 
 if __name__ == "__main__":

{machineconfig-6.73.dist-info → machineconfig-6.74.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 6.73
+Version: 6.74
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-6.73.dist-info → machineconfig-6.74.dist-info}/RECORD

@@ -400,7 +400,7 @@ machineconfig/utils/code.py,sha256=FGM3s422q0I4zoYi2Gftohj1xZpyL7XKAHM__oEVGZg,5
 machineconfig/utils/installer.py,sha256=UzI_DtTcKbgvkAkWkNLAPUtx-RVqITHCpvZyLiCpD9g,10377
 machineconfig/utils/io.py,sha256=4dSieoqZO8Vvi4vW8lLoITDHBvmFp4dtl3kyeZHQ6Co,2528
 machineconfig/utils/links.py,sha256=KM6vIn3hag9FYEzLSHP5MAM9tU_RStw2mCq2_OvmmZA,23672
-machineconfig/utils/meta.py,sha256=wVa4C6wV7pqrpwmQ6IEaPxK3Xew9NxM6HpDMu51q5kI,9053
+machineconfig/utils/meta.py,sha256=af7q6p9ASpc_YXL564ptGgo7ZgmlmX4Av11si8O27bY,9511
 machineconfig/utils/notifications.py,sha256=tuXIudcip0tEioG-bm8BbLr3FMDve4f6BktlznBhKxM,9013
 machineconfig/utils/options.py,sha256=vUO4Kej-vDOv64wHr2HNDyu6PATURpjd7xp6N8OOoJg,7083
 machineconfig/utils/path_extended.py,sha256=WyJwoHnXdvSQQJ-yrxTX78FpqYmgVeKDYpNEB9UsRck,53223
@@ -438,8 +438,8 @@ machineconfig/utils/schemas/installer/installer_types.py,sha256=QClRY61QaduBPJoS
 machineconfig/utils/schemas/layouts/layout_types.py,sha256=TcqlZdGVoH8htG5fHn1KWXhRdPueAcoyApppZsPAPto,2020
 machineconfig/utils/schemas/repos/repos_types.py,sha256=ECVr-3IVIo8yjmYmVXX2mnDDN1SLSwvQIhx4KDDQHBQ,405
 machineconfig/utils/ssh_utils/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig-6.73.dist-info/METADATA,sha256=oj87PggeTxlHlJ60TZGV5AOBLteOPqeDWiefj8yoAOc,2928
-machineconfig-6.73.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-machineconfig-6.73.dist-info/entry_points.txt,sha256=NTW7hbUlpt5Vx9DdQrONLkYMCuBXpvYh1dt0AtlGxeI,466
-machineconfig-6.73.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
-machineconfig-6.73.dist-info/RECORD,,
+machineconfig-6.74.dist-info/METADATA,sha256=692qBPW0k0wBu8OAbluLRsNWPapPYstbPzf7eLIVXkw,2928
+machineconfig-6.74.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+machineconfig-6.74.dist-info/entry_points.txt,sha256=NTW7hbUlpt5Vx9DdQrONLkYMCuBXpvYh1dt0AtlGxeI,466
+machineconfig-6.74.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
+machineconfig-6.74.dist-info/RECORD,,