fastworkflow 2.8.13__py3-none-any.whl → 2.8.14__py3-none-any.whl

fastworkflow/cli.py

@@ -129,15 +129,15 @@ def train_example(args):
     """Train an existing example workflow."""
     # Check if example exists in the local examples directory
     local_examples_dir = Path("./examples")
-    example_path = local_examples_dir / args.name
+    workflow_path = local_examples_dir / args.name
     
-    if not example_path.is_dir():
+    if not workflow_path.is_dir():
         print(f"Error: Example '{args.name}' not found in '{local_examples_dir}'.", file=sys.stderr)
         print(f"Use 'fastworkflow examples fetch {args.name}' to fetch the example first.")
         print("Or use 'fastworkflow examples list' to see available examples.")
         sys.exit(1)
 
-    print(f"Training example in '{example_path}'...")
+    print(f"Training example in '{workflow_path}'...")
 
     # Get the appropriate env files for this example workflow
     env_file_path, passwords_file_path = find_default_env_files(local_examples_dir)
@@ -158,41 +158,29 @@ def train_example(args):
         print(f"  {local_examples_dir}/fastworkflow.passwords.env")
         sys.exit(1)
 
-    # The `train` script needs the path to the workflow, and the env files
-    cmd = [
-        sys.executable,
-        "-m", "fastworkflow.train",
-        str(example_path),
-        str(env_file),
-        str(passwords_file)
-    ]
+    # Create args object for train_main
+    train_args = argparse.Namespace(
+        workflow_folderpath=str(workflow_path),
+        env_file_path=str(env_file),
+        passwords_file_path=str(passwords_file)
+    )
 
     try:
-        # We run the command from the current working directory
-        process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True, encoding='utf-8')
-
-        # Stream the output
-        if process.stdout:
-            for line in iter(process.stdout.readline, ''):
-                print(line, end='')
-
-        process.wait()
-
-        if process.returncode == 0:
+        # Call train_main directly instead of using subprocess
+        result = train_main(train_args)
+        
+        if result is None or result == 0:
             print(f"\n✅ Successfully trained example '{args.name}'.")
-            print(f"You can now run it with:\npython -m fastworkflow.run {example_path}")
+            print(f"You can now run it with:\npython -m fastworkflow.run {workflow_path}")
         else:
-            print(f"\n❌ Training failed with exit code {process.returncode}.", file=sys.stderr)
+            print(f"\n❌ Training failed.", file=sys.stderr)
             sys.exit(1)
 
-    except FileNotFoundError:
-        print("Error: 'python' executable not found. Make sure your environment is set up correctly.", file=sys.stderr)
-        sys.exit(1)
     except Exception as e:
         print(f"An unexpected error occurred during training: {e}", file=sys.stderr)
         sys.exit(1)
 
-def find_default_env_files(workflow_path=None):
+def find_default_env_files(workflow_path):
     """Find the appropriate default env files based on context.
     
     If the workflow path is within the examples directory, use the local examples env files.
@@ -204,34 +192,8 @@ def find_default_env_files(workflow_path=None):
     Returns:
         tuple: (env_file_path, passwords_file_path)
     """
-    # Default to local env files for user workflows
-    default_env = ".env"
-    default_passwords = "passwords.env"
-    
-    # If workflow_path is provided and seems to be an example workflow
-    if workflow_path:
-        workflow_path = Path(workflow_path)
-        examples_dir, is_package = find_examples_dir()
-        
-        if examples_dir and (
-            str(workflow_path).startswith(str(examples_dir)) or
-            "/examples/" in str(workflow_path) or
-            "\\examples\\" in str(workflow_path)
-        ):
-            # For example workflows, check for the env files in the local examples directory
-            local_examples_dir = Path("./examples")
-            local_env = local_examples_dir / "fastworkflow.env"
-            local_passwords = local_examples_dir / "fastworkflow.passwords.env"
-            
-            if local_env.exists() and local_passwords.exists():
-                return str(local_env), str(local_passwords)
-            
-            # If not found locally, return the expected paths anyway
-            # (the calling function will handle the error appropriately)
-            return str(local_env), str(local_passwords)
-    
-    # For user workflows, use local env files
-    return default_env, default_passwords
+    workflow_path = Path(workflow_path)        
+    return workflow_path / "fastworkflow.env", workflow_path / "fastworkflow.passwords.env"
 
 def add_build_parser(subparsers):
     """Add subparser for the 'build' command."""
@@ -365,9 +327,9 @@ def run_example(args):
     """Run an existing example workflow."""
     # Check if example exists in the local examples directory
     local_examples_dir = Path("./examples")
-    example_path = local_examples_dir / args.name
+    workflow_path = local_examples_dir / args.name
     
-    if not example_path.is_dir():
+    if not workflow_path.is_dir():
         print(f"Error: Example '{args.name}' not found in '{local_examples_dir}'.", file=sys.stderr)
         print(f"Use 'fastworkflow examples fetch {args.name}' to fetch the example first.")
         print("Or use 'fastworkflow examples list' to see available examples.")
@@ -397,7 +359,7 @@ def run_example(args):
         sys.exit(1)
 
     # Check if the example has been trained
-    command_info_dir = example_path / "___command_info"
+    command_info_dir = workflow_path / "___command_info"
     if not command_info_dir.exists() or not any(command_info_dir.iterdir()):
         print(f"Warning: Example '{args.name}' does not appear to be trained yet.", file=sys.stderr)
         print(f"Please train the example first with:")
@@ -412,7 +374,7 @@ def run_example(args):
     cmd = [
         sys.executable,
         "-m", "fastworkflow.run",
-        str(example_path),
+        str(workflow_path),
         str(env_file),
         str(passwords_file)
     ]

{fastworkflow-2.8.13.dist-info → fastworkflow-2.8.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastworkflow
-Version: 2.8.13
+Version: 2.8.14
 Summary: A framework for rapidly building large-scale, deterministic, interactive workflows with a fault-tolerant, conversational UX
 License: Apache-2.0
 Keywords: fastworkflow,ai,workflow,llm,openai

{fastworkflow-2.8.13.dist-info → fastworkflow-2.8.14.dist-info}/RECORD

@@ -31,7 +31,7 @@ fastworkflow/build/pydantic_model_generator.py,sha256=272j_O82sIEtUxnZH6rwM5dbEu
 fastworkflow/build/utterance_generator.py,sha256=OuxIZAl70ZW5l5jIlQxsE9gfzyCwXTtSdhK67Zwyk-I,1668
 fastworkflow/cache_matching.py,sha256=WoSQ7QuVGqOnecsIIdwb3A6gBpt0OJdSzx_a51nHoFA,6458
 fastworkflow/chat_session.py,sha256=lEpJmU_2a-4pB4QR7wACl8jHWZls1ROtQGgdVObY3BA,12308
-fastworkflow/cli.py,sha256=-JN62W1WX6JjSwBFObtAKcgUDvm_6YInG5ewkxir8nQ,23102
+fastworkflow/cli.py,sha256=GmwV-uWOysBIxA17pPR4s357Qut7ge5R2nTteYnIkOc,21526
 fastworkflow/command_context_model.py,sha256=nWxLP3TR7WJr3yWCedqcdFOxo_kwae_mS3VRN2cOmK8,13437
 fastworkflow/command_directory.py,sha256=iUW8168fX6bTytPtYI1gcTHqORv0_qNZ7Nhhwr-ujqs,27163
 fastworkflow/command_executor.py,sha256=bKqOHBEVhCunE3B-zh6DNLERUiSmEiVJdfEoVVUq-zM,6412
@@ -146,8 +146,8 @@ fastworkflow/utils/pydantic_model_2_dspy_signature_class.py,sha256=w1pvl8rJq48ul
 fastworkflow/utils/python_utils.py,sha256=Lt6P8lBMbLuLZaP9gd_7Kl7UvSPLm-NKPN6cPUdn53w,8194
 fastworkflow/utils/signatures.py,sha256=4ksF-65Q-22ZR_SW8O_cv5RhKKk0ecmWgykoAGKxr-k,19957
 fastworkflow/workflow.py,sha256=zHsA67IMlHAhpgM2CN96G_KsU_eMVXJf7axZ2zBBdhU,16436
-fastworkflow-2.8.13.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fastworkflow-2.8.13.dist-info/METADATA,sha256=rn1eEY18U2uEwmHlmRp643tZ6YppuFfV-G670MnR2Kg,15387
-fastworkflow-2.8.13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fastworkflow-2.8.13.dist-info/entry_points.txt,sha256=m8HqoPzCyaZLAx-V5X8MJgw3Lx3GiPDlxNEZ7K-Gb-U,54
-fastworkflow-2.8.13.dist-info/RECORD,,
+fastworkflow-2.8.14.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fastworkflow-2.8.14.dist-info/METADATA,sha256=T4cyt9gfiaVGLmgwfGxRzXM-jUn9EIuYXYpo8Y7Ss9Q,15387
+fastworkflow-2.8.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fastworkflow-2.8.14.dist-info/entry_points.txt,sha256=m8HqoPzCyaZLAx-V5X8MJgw3Lx3GiPDlxNEZ7K-Gb-U,54
+fastworkflow-2.8.14.dist-info/RECORD,,