Flowfile 0.3.4.1__py3-none-any.whl → 0.3.5__py3-none-any.whl

flowfile/api.py

@@ -147,9 +147,6 @@ def build_server_command(module_name: str) -> List[str]:
     Build the appropriate command to start the server based on environment detection.
     Tries Poetry first if in a Poetry environment, falls back to direct module execution.
     """
-    command: List[str] = []
-
-    # Case 1: Check if we're in a Poetry environment
     if is_poetry_environment():
         logger.info("Poetry environment detected.")
         if is_command_available(POETRY_PATH):
@@ -166,17 +163,42 @@ def build_server_command(module_name: str) -> List[str]:
         else:
             logger.warning(f"Poetry command not found at '{POETRY_PATH}'. Falling back to Python module.")
 
-    # Case 2: Try direct module execution
-    logger.info(f"Using Python module approach with {module_name}")
-    command = [
-        sys.executable,
-        "-m",
-        module_name,
-        "run",
-        "ui",
-        "--no-browser",
-    ]
+    # Case 2: Fallback to direct script execution
+    logger.info("Falling back to direct script execution.")
+    python_parent_dir = Path(sys.executable).parent
+    command: List[str]
+    scripts_dir = Path(sys.executable).parent
+
+    if platform.system() == "Windows":
+        exe_path = scripts_dir / f"{module_name}.exe"
+        script_py_path = scripts_dir / f"{module_name}-script.py"
+        plain_script_path = scripts_dir / module_name
+
+        if exe_path.exists():
+            logger.info(f"Using .exe wrapper: {exe_path}")
+            command = [str(exe_path), "run", "ui", "--no-browser"]
+        elif script_py_path.exists():
+            logger.info(f"Using '-script.py' with interpreter: {script_py_path}")
+            command = [sys.executable, str(script_py_path), "run", "ui", "--no-browser"]
+        elif plain_script_path.exists():
+            logger.info(f"Using plain script with interpreter: {plain_script_path}")
+            command = [sys.executable, str(plain_script_path), "run", "ui", "--no-browser"]
+        else:
+            raise FileNotFoundError(
+                f"Could not find an executable script for '{module_name}' in '{scripts_dir}'. "
+                f"Checked for '{exe_path.name}', '{script_py_path.name}', and '{plain_script_path.name}'. "
+                "Ensure the package is installed correctly."
+            )
+    else:
+        # On Unix-like systems, the script in 'bin' is directly executable
+        script_path = python_parent_dir / "bin" / module_name
+        if not script_path.exists():
+            script_path = python_parent_dir / module_name # Fallback for different venv structures
+
+        logger.info(f"Using direct script execution path: {script_path}")
+        command = [str(script_path), "run", "ui", "--no-browser"]
 
+    logger.info(f"Built server command: {command}")
     return command
 
 
@@ -210,7 +232,6 @@ def start_flowfile_server_process(module_name: str = DEFAULT_MODULE_NAME) -> Tup
     # Build command automatically based on environment detection
     command = build_server_command(module_name)
     logger.info(f"Starting server with command: {' '.join(command)}")
-
     try:
         # Windows-specific subprocess creation
         if platform.system() == "Windows":
@@ -244,7 +265,7 @@ def start_flowfile_server_process(module_name: str = DEFAULT_MODULE_NAME) -> Tup
             time.sleep(1)
         else:
             logger.error("Failed to start server: API did not become responsive within 60 seconds. "
-                         "Try again or try start service by running\n"
+                         "Try again or start service by running\n"
                          "flowfile run ui")
             if _server_process and _server_process.stderr:
                 try:

{flowfile-0.3.4.1.dist-info → flowfile-0.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: Flowfile
-Version: 0.3.4.1
+Version: 0.3.5
 Summary: Project combining flowfile core (backend) and flowfile_worker (compute offloader) and flowfile_frame (api)
 Author: Edward van Eechoud
 Author-email: evaneechoud@gmail.com

{flowfile-0.3.4.1.dist-info → flowfile-0.3.5.dist-info}/RECORD

@@ -3,7 +3,7 @@ build_backends/main.py,sha256=hLmfqTeHLSTiwwZ5mUuoLQgtO40Igvl1_4NbnvzWSgI,9912
 build_backends/main_prd.py,sha256=JR2tYCMWM5ThooQjv5pw6nwVKMQjgsiHgKMhYn9NXWI,6927
 flowfile/__init__.py,sha256=XitnMG5qDMFiS3Y0iQ-yj1ODlNa59uT2y4IJCcDn0tU,2449
 flowfile/__main__.py,sha256=cpWeAL9Xw2qHfm52ZCAQzQhjoOAmVFSXPL-8MrnWAxA,2540
-flowfile/api.py,sha256=c0IRR03jrOzMuhNMDfiHm0lfLCtPtg3whexc1dUciJc,17130
+flowfile/api.py,sha256=PqlYPJqXqq4z0jW4w1r-rhrdzEX5WfwcMOZ87osOw4Q,18634
 flowfile/web/__init__.py,sha256=mFAAdo3rQGi3b_fu5FJH69JR0eHWUg44AHW03MuRChQ,5756
 flowfile/web/static/assets/AirbyteReader-1ac35765.css,sha256=GsNXZRBzBqcgSHWYHFfpQjYnQ1G90hCaWgThLCG80jI,6260
 flowfile/web/static/assets/AirbyteReader-e08044e5.js,sha256=aqR9n686reSpNrLTYPP4LzzJvopBvE-pAozL24X2V9Q,38789
@@ -160,7 +160,7 @@ flowfile_core/flowfile/analytics/graphic_walker.py,sha256=snYNQUTPZLhtz1egv_rSmo
 flowfile_core/flowfile/analytics/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flowfile_core/flowfile/analytics/utils.py,sha256=x-FS1ZwQrHLzAfKm1THiQEKeCm_w0vO5dyWgyyIPjLY,487
 flowfile_core/flowfile/code_generator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-flowfile_core/flowfile/code_generator/code_generator.py,sha256=z526qAMARoZ-DECh8CQIJYjSbfg8V9g_x6oyS2ZSylY,31048
+flowfile_core/flowfile/code_generator/code_generator.py,sha256=gzzgh8moVBmCqzCaxczVVjIkXASWIfLqcwZnRyLie1w,31015
 flowfile_core/flowfile/connection_manager/__init__.py,sha256=wLAGuQBA0lgN1tZleYZ32eFeY4UODG46RrclWoEc7hM,134
 flowfile_core/flowfile/connection_manager/_connection_manager.py,sha256=W9FWRAFUT1c2eHa2QhFpKNWA-Kps63o2vcGAH1zXSeo,2612
 flowfile_core/flowfile/connection_manager/models.py,sha256=o_2FK7aNdjMHfiGX7hIUz5uslfLar8KIcI_760WprzM,227
@@ -306,8 +306,8 @@ test_utils/__init__.py,sha256=8WwOgIuKw6YtOc1GWR1DqIhQ8BhlLWqsMyQJSpxnzKk,66
 test_utils/postgres/__init__.py,sha256=y3V_6a9N1Pvm5NIBaA8CFf3i4mvPVY-H1teHA-rg0VU,33
 test_utils/postgres/commands.py,sha256=4oA8EHW3EqwGkG02HSqEGbXEBGM01sUW5FsyHm86W4k,4347
 test_utils/postgres/fixtures.py,sha256=kR8UBjQr3pgbe-xM-V8x8VseTHCPv0EmDEzPHl5Qc8Y,13507
-flowfile-0.3.4.1.dist-info/LICENSE,sha256=pCfLAA27jMHReYk_wGiirZxWRRXz_Bm7PVInRCa9P5g,1075
-flowfile-0.3.4.1.dist-info/METADATA,sha256=V616ndPOXmwvBWFqygkCELEv5JCQp0s5q_k11agm35c,8597
-flowfile-0.3.4.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-flowfile-0.3.4.1.dist-info/entry_points.txt,sha256=Q3CEYNk33UaWlA9D-8yXYH0FwjKBsrtNuzzzHxhwnNI,333
-flowfile-0.3.4.1.dist-info/RECORD,,
+flowfile-0.3.5.dist-info/LICENSE,sha256=pCfLAA27jMHReYk_wGiirZxWRRXz_Bm7PVInRCa9P5g,1075
+flowfile-0.3.5.dist-info/METADATA,sha256=r1ddYzejKRpdJghcfhVUffB4b2KHuk9Z5rNV8c2aJT4,8595
+flowfile-0.3.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+flowfile-0.3.5.dist-info/entry_points.txt,sha256=Q3CEYNk33UaWlA9D-8yXYH0FwjKBsrtNuzzzHxhwnNI,333
+flowfile-0.3.5.dist-info/RECORD,,

flowfile_core/flowfile/code_generator/code_generator.py

@@ -509,7 +509,7 @@ class FlowGraphToPolarsConverter:
             args = ", ".join(arg_list)
 
         # Check if the code is just an expression (no assignment)
-        is_expression = '=' not in code or code.count('=') == 1 and '==' in code
+        is_expression = "output_df" not in code
 
         # Wrap the code in a function
         self._add_code(f"# Custom Polars code")