lfx-nightly 0.1.11.dev7__py3-none-any.whl → 0.1.12.dev0__py3-none-any.whl

lfx/custom/validate.py

@@ -298,6 +298,28 @@ def create_type_ignore_class():
     return TypeIgnore
 
 
+def _import_module_with_warnings(module_name):
+    """Import module with appropriate warning suppression."""
+    if "langchain" in module_name:
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", LangChainDeprecationWarning)
+            return importlib.import_module(module_name)
+    else:
+        return importlib.import_module(module_name)
+
+
+def _handle_module_attributes(imported_module, node, module_name, exec_globals):
+    """Handle importing specific attributes from a module."""
+    for alias in node.names:
+        try:
+            # First try getting it as an attribute
+            exec_globals[alias.name] = getattr(imported_module, alias.name)
+        except AttributeError:
+            # If that fails, try importing the full module path
+            full_module_path = f"{module_name}.{alias.name}"
+            exec_globals[alias.name] = importlib.import_module(full_module_path)
+
+
 def prepare_global_scope(module):
     """Prepares the global scope with necessary imports from the provided code module.
 
@@ -334,27 +356,31 @@ def prepare_global_scope(module):
                 raise ModuleNotFoundError(msg) from e
 
     for node in import_froms:
-        try:
-            module_name = node.module
-            # Apply warning suppression only when needed
-            if "langchain" in module_name:
-                with warnings.catch_warnings():
-                    warnings.simplefilter("ignore", LangChainDeprecationWarning)
-                    imported_module = importlib.import_module(module_name)
-            else:
-                imported_module = importlib.import_module(module_name)
+        module_names_to_try = [node.module]
 
-            for alias in node.names:
-                try:
-                    # First try getting it as an attribute
-                    exec_globals[alias.name] = getattr(imported_module, alias.name)
-                except AttributeError:
-                    # If that fails, try importing the full module path
-                    full_module_path = f"{module_name}.{alias.name}"
-                    exec_globals[alias.name] = importlib.import_module(full_module_path)
-        except ModuleNotFoundError as e:
+        # If original module starts with langflow, also try lfx equivalent
+        if node.module and node.module.startswith("langflow."):
+            lfx_module_name = node.module.replace("langflow.", "lfx.", 1)
+            module_names_to_try.append(lfx_module_name)
+
+        success = False
+        last_error = None
+
+        for module_name in module_names_to_try:
+            try:
+                imported_module = _import_module_with_warnings(module_name)
+                _handle_module_attributes(imported_module, node, module_name, exec_globals)
+
+                success = True
+                break
+
+            except ModuleNotFoundError as e:
+                last_error = e
+                continue
+
+        if not success:
             msg = f"Module {node.module} not found. Please install it and try again"
-            raise ModuleNotFoundError(msg) from e
+            raise ModuleNotFoundError(msg) from last_error
 
     if definitions:
         combined_module = ast.Module(body=definitions, type_ignores=[])

{lfx_nightly-0.1.11.dev7.dist-info → lfx_nightly-0.1.12.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lfx-nightly
-Version: 0.1.11.dev7
+Version: 0.1.12.dev0
 Summary: Langflow Executor - A lightweight CLI tool for executing and serving Langflow AI flows
 Author-email: Gabriel Luiz Freitas Almeida <gabriel@langflow.org>
 Requires-Python: <3.14,>=3.10
@@ -16,6 +16,7 @@ Requires-Dist: fastapi>=0.115.13
 Requires-Dist: httpx[http2]>=0.24.0
 Requires-Dist: json-repair>=0.30.3
 Requires-Dist: langchain-core>=0.3.66
+Requires-Dist: loguru>=0.7.3
 Requires-Dist: nanoid>=2.0.0
 Requires-Dist: networkx>=3.4.2
 Requires-Dist: orjson>=3.10.15

{lfx_nightly-0.1.11.dev7.dist-info → lfx_nightly-0.1.12.dev0.dist-info}/RECORD

@@ -536,7 +536,7 @@ lfx/custom/eval.py,sha256=6iekrFA2xHopjorhU06Je5cksgq9KWCHjr_84ehC58c,378
 lfx/custom/schema.py,sha256=WwHe0TnNauyiaC17-bKSyEb8K7KJxBtkB32OSbxiICY,678
 lfx/custom/tree_visitor.py,sha256=sa4j8VTwksN8ejTE9fnnH1TpD6OnnTtlg2KemiI-eQA,601
 lfx/custom/utils.py,sha256=eFZcNHvpUhb1Fx6Kbvna2wS0coN3Iub8CW0MvrpstMM,35958
-lfx/custom/validate.py,sha256=aJvAySmoGiC4KjUL9rNMOYYWxPGThVcHcInIV5aKNMQ,16313
+lfx/custom/validate.py,sha256=d5bZTeYK64P2mOMPEJgbvgvtBxZ5P7XFuXCNof3dXPg,17074
 lfx/custom/code_parser/__init__.py,sha256=qIwZQdEp1z7ldn0z-GY44wmwRaywN3L6VPoPt6lqx1k,62
 lfx/custom/code_parser/code_parser.py,sha256=QAqsp4QF607319dClK60BsaiwZLV55n0xeGR-DthSoE,14280
 lfx/custom/custom_component/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -693,7 +693,7 @@ lfx/utils/schemas.py,sha256=NbOtVQBrn4d0BAu-0H_eCTZI2CXkKZlRY37XCSmuJwc,3865
 lfx/utils/util.py,sha256=xGR32XDRr_TtruhjnXfI7lEWmk-vgywHAy3kz5SBowc,15725
 lfx/utils/util_strings.py,sha256=nU_IcdphNaj6bAPbjeL-c1cInQPfTBit8mp5Y57lwQk,1686
 lfx/utils/version.py,sha256=cHpbO0OJD2JQAvVaTH_6ibYeFbHJV0QDHs_YXXZ-bT8,671
-lfx_nightly-0.1.11.dev7.dist-info/METADATA,sha256=zHBECXdO597ceJZd14mhIrATBlHHfhBx4Irs7b79B_4,7971
-lfx_nightly-0.1.11.dev7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-lfx_nightly-0.1.11.dev7.dist-info/entry_points.txt,sha256=1724p3RHDQRT2CKx_QRzEIa7sFuSVO0Ux70YfXfoMT4,42
-lfx_nightly-0.1.11.dev7.dist-info/RECORD,,
+lfx_nightly-0.1.12.dev0.dist-info/METADATA,sha256=2-HWdV_bpI8ChwlifgmnuZ7U8rEfbmdeaszShAytmIw,8000
+lfx_nightly-0.1.12.dev0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+lfx_nightly-0.1.12.dev0.dist-info/entry_points.txt,sha256=1724p3RHDQRT2CKx_QRzEIa7sFuSVO0Ux70YfXfoMT4,42
+lfx_nightly-0.1.12.dev0.dist-info/RECORD,,