flock-core 0.4.0b34__py3-none-any.whl → 0.4.0b35__py3-none-any.whl

flock/webapp/app/services/flock_service.py

@@ -0,0 +1,291 @@
+import yaml  # For parsing issues, if any, during load
+
+from flock.core import Flock, FlockFactory
+from flock.core.flock_registry import get_registry
+from flock.webapp.app.config import (
+    CURRENT_FLOCK_FILENAME,
+    CURRENT_FLOCK_INSTANCE,
+    FLOCK_FILES_DIR,
+)
+
+
+def get_available_flock_files() -> list[str]:
+    if not FLOCK_FILES_DIR.exists():
+        return []
+    return sorted(
+        [
+            f.name
+            for f in FLOCK_FILES_DIR.iterdir()
+            if f.is_file() and (f.suffix in [".yaml", ".yml", ".flock"])
+        ]
+    )
+
+
+def load_flock_from_file_service(filename: str) -> Flock | None:
+    global CURRENT_FLOCK_INSTANCE, CURRENT_FLOCK_FILENAME
+    file_path = FLOCK_FILES_DIR / filename
+    if not file_path.exists():
+        print(f"Error: File not found {file_path}")
+        CURRENT_FLOCK_INSTANCE = None
+        CURRENT_FLOCK_FILENAME = None
+        return None
+    try:
+        # Temporarily clear registry parts that might be file-specific if needed,
+        # or ensure load_from_file handles re-registration gracefully.
+        # For MVP, assume load_from_file is robust enough.
+        CURRENT_FLOCK_INSTANCE = Flock.load_from_file(str(file_path))
+        CURRENT_FLOCK_FILENAME = filename
+        print(
+            f"Successfully loaded flock: {CURRENT_FLOCK_INSTANCE.name if CURRENT_FLOCK_INSTANCE else 'None'}"
+        )
+        return CURRENT_FLOCK_INSTANCE
+    except Exception as e:
+        print(f"Error loading flock from {file_path}: {e}")
+        CURRENT_FLOCK_INSTANCE = None
+        CURRENT_FLOCK_FILENAME = None
+        return None
+
+
+def create_new_flock_service(
+    name: str, model: str | None, description: str | None
+) -> Flock:
+    global CURRENT_FLOCK_INSTANCE, CURRENT_FLOCK_FILENAME
+    effective_model = model.strip() if model and model.strip() else None
+    CURRENT_FLOCK_INSTANCE = Flock(
+        name=name,
+        model=effective_model,
+        description=description,
+        show_flock_banner=False,
+        enable_logging=False,
+    )
+    CURRENT_FLOCK_FILENAME = f"{name.replace(' ', '_').lower()}.flock.yaml"
+    print(f"Created new flock: {name}")
+    return CURRENT_FLOCK_INSTANCE
+
+
+def get_current_flock_instance() -> Flock | None:
+    return CURRENT_FLOCK_INSTANCE
+
+
+def get_current_flock_filename() -> str | None:
+    return CURRENT_FLOCK_FILENAME
+
+
+def set_current_flock_instance_programmatically(flock: Flock, filename: str):
+    """Sets the current flock instance and filename programmatically.
+    Used when launching the UI with a pre-loaded flock from an external source (e.g., API server).
+    """
+    global CURRENT_FLOCK_INSTANCE, CURRENT_FLOCK_FILENAME
+    CURRENT_FLOCK_INSTANCE = flock
+    CURRENT_FLOCK_FILENAME = filename
+    print(
+        f"Programmatically set flock: {filename} (Name: {flock.name if flock else 'None'})"
+    )
+
+
+def set_current_flock_filename(filename: str | None):
+    global CURRENT_FLOCK_FILENAME
+    CURRENT_FLOCK_FILENAME = filename
+
+
+def clear_current_flock():
+    global CURRENT_FLOCK_INSTANCE, CURRENT_FLOCK_FILENAME
+    CURRENT_FLOCK_INSTANCE = None
+    CURRENT_FLOCK_FILENAME = None
+    print("Current flock cleared.")
+
+
+def save_current_flock_to_file_service(new_filename: str) -> tuple[bool, str]:
+    global CURRENT_FLOCK_INSTANCE, CURRENT_FLOCK_FILENAME
+    if not CURRENT_FLOCK_INSTANCE:
+        return False, "No flock loaded to save."
+    if not new_filename.strip():
+        return False, "Filename cannot be empty."
+    save_path = FLOCK_FILES_DIR / new_filename
+    try:
+        CURRENT_FLOCK_INSTANCE.to_yaml_file(str(save_path))
+        CURRENT_FLOCK_FILENAME = new_filename
+        return True, f"Flock saved to {new_filename}."
+    except Exception as e:
+        return False, f"Error saving flock: {e}"
+
+
+def update_flock_properties_service(
+    name: str, model: str | None, description: str | None
+) -> bool:
+    # ... (same as before)
+    global CURRENT_FLOCK_INSTANCE, CURRENT_FLOCK_FILENAME
+    if not CURRENT_FLOCK_INSTANCE:
+        return False
+    old_name_default_filename = (
+        f"{CURRENT_FLOCK_INSTANCE.name.replace(' ', '_').lower()}.flock.yaml"
+    )
+    if (
+        old_name_default_filename == CURRENT_FLOCK_FILENAME
+        and CURRENT_FLOCK_INSTANCE.name != name
+    ):
+        CURRENT_FLOCK_FILENAME = f"{name.replace(' ', '_').lower()}.flock.yaml"
+
+    CURRENT_FLOCK_INSTANCE.name = name
+    CURRENT_FLOCK_INSTANCE.model = (
+        model.strip() if model and model.strip() else None
+    )
+    CURRENT_FLOCK_INSTANCE.description = description
+    return True
+
+
+def add_agent_to_current_flock_service(agent_config: dict) -> bool:
+    # ... (same as before) ...
+    global CURRENT_FLOCK_INSTANCE
+    if not CURRENT_FLOCK_INSTANCE:
+        return False
+    registry = get_registry()
+    tools_instances = []
+    if agent_config.get("tools_names"):
+        for tool_name in agent_config["tools_names"]:
+            try:
+                tools_instances.append(registry.get_callable(tool_name))
+            except KeyError:
+                print(f"Warning: Tool '{tool_name}' not found. Skipping.")
+    try:
+        agent = FlockFactory.create_default_agent(
+            name=agent_config["name"],
+            description=agent_config.get("description"),
+            model=agent_config.get("model"),
+            input=agent_config["input"],
+            output=agent_config["output"],
+            tools=tools_instances or None,
+        )
+        handoff_target = agent_config.get("default_router_handoff")
+        if handoff_target:
+            from flock.routers.default.default_router import DefaultRouterConfig
+
+            agent.add_component(DefaultRouterConfig(hand_off=handoff_target))
+        CURRENT_FLOCK_INSTANCE.add_agent(agent)
+        return True
+    except Exception as e:
+        print(f"Error adding agent: {e}")
+        return False
+
+
+def update_agent_in_current_flock_service(
+    original_agent_name: str, agent_config: dict
+) -> bool:
+    # ... (same as before) ...
+    global CURRENT_FLOCK_INSTANCE
+    if not CURRENT_FLOCK_INSTANCE:
+        return False
+    agent_to_update = CURRENT_FLOCK_INSTANCE.agents.get(original_agent_name)
+    if not agent_to_update:
+        return False
+    registry = get_registry()
+    tools_instances = []
+    if agent_config.get("tools_names"):
+        for tool_name in agent_config["tools_names"]:
+            try:
+                tools_instances.append(registry.get_callable(tool_name))
+            except KeyError:
+                print(f"Warning: Tool '{tool_name}' not found. Skipping.")
+    try:
+        new_name = agent_config["name"]
+        agent_to_update.description = agent_config.get("description")
+        agent_to_update.model = agent_config.get("model")
+        agent_to_update.input = agent_config["input"]
+        agent_to_update.output = agent_config["output"]
+        agent_to_update.tools = tools_instances or None
+        handoff_target = agent_config.get("default_router_handoff")
+        if handoff_target:
+            from flock.routers.default.default_router import DefaultRouterConfig
+
+            agent_to_update.add_component(
+                DefaultRouterConfig(hand_off=handoff_target)
+            )
+        elif agent_to_update.handoff_router:
+            agent_to_update.handoff_router = None
+        if original_agent_name != new_name:
+            CURRENT_FLOCK_INSTANCE._agents[new_name] = (
+                CURRENT_FLOCK_INSTANCE._agents.pop(original_agent_name)
+            )
+        agent_to_update.name = new_name
+        return True
+    except Exception as e:
+        print(f"Error updating agent: {e}")
+        return False
+
+
+def remove_agent_from_current_flock_service(agent_name: str) -> bool:
+    # ... (same as before) ...
+    global CURRENT_FLOCK_INSTANCE
+    if (
+        not CURRENT_FLOCK_INSTANCE
+        or agent_name not in CURRENT_FLOCK_INSTANCE.agents
+    ):
+        return False
+    del CURRENT_FLOCK_INSTANCE._agents[agent_name]
+    return True
+
+
+async def run_current_flock_service(
+    start_agent_name: str, inputs: dict
+) -> dict | str:
+    global CURRENT_FLOCK_INSTANCE
+    if not CURRENT_FLOCK_INSTANCE:
+        return "Error: No flock loaded."
+    if (
+        not start_agent_name
+        or start_agent_name not in CURRENT_FLOCK_INSTANCE.agents
+    ):
+        return f"Error: Start agent '{start_agent_name}' not found."
+    try:
+        result = await CURRENT_FLOCK_INSTANCE.run_async(
+            start_agent=start_agent_name, input=inputs, box_result=False
+        )
+        # Don't convert here - let the API route handle it to avoid double conversion
+        return result
+    except Exception as e:
+        print(f"Error during flock execution: {e}")
+        return f"Error: {e!s}"
+
+
+def get_registered_items_service(item_type: str) -> list:
+    # ... (same as before) ...
+    registry = get_registry()
+    items, items_dict = [], None
+    if item_type == "type":
+        items_dict = registry._types
+    elif item_type == "tool":
+        items_dict = registry._callables
+    elif item_type == "component":
+        items_dict = registry._components
+    else:
+        return []
+    for name, item_obj in items_dict.items():
+        module_path = "N/A"
+        try:
+            module_path = item_obj.__module__
+        except AttributeError:
+            pass
+        items.append({"name": name, "module": module_path})
+    return sorted(items, key=lambda x: x["name"])
+
+
+def get_flock_preview_service(filename: str) -> dict | None:
+    """Loads only basic properties of a flock file for preview without full deserialization."""
+    file_path = FLOCK_FILES_DIR / filename
+    if not file_path.exists():
+        return None
+    try:
+        with file_path.open("r", encoding="utf-8") as f:
+            # Load YAML just to get top-level keys
+            data = yaml.safe_load(f)
+            if isinstance(data, dict):
+                return {
+                    "name": data.get("name", filename),
+                    "model": data.get("model"),
+                    "description": data.get("description"),
+                    "agents_count": len(data.get("agents", {})),
+                }
+        return {"name": filename, "error": "Not a valid Flock YAML structure"}
+    except Exception as e:
+        print(f"Error getting flock preview for {filename}: {e}")
+        return {"name": filename, "error": str(e)}

flock/webapp/app/utils.py

@@ -0,0 +1,85 @@
+import inspect
+import json
+from typing import Any
+
+def is_pydantic_model(obj: Any) -> bool:
+    """
+    Check if an object is a Pydantic model instance.
+    More robust detection for both v1 and v2 Pydantic models.
+    """
+    # Check for Pydantic v2 model
+    if hasattr(obj, "__class__") and hasattr(obj.__class__, "model_dump"):
+        return True
+    
+    # Check for Pydantic v1 model
+    if hasattr(obj, "__class__") and hasattr(obj.__class__, "schema") and hasattr(obj, "dict"):
+        return True
+    
+    # Check if it has a __pydantic_core__ attribute (v2 models)
+    if hasattr(obj, "__pydantic_core__"):
+        return True
+        
+    # Final check: class name check and module check
+    if hasattr(obj, "__class__"):
+        cls = obj.__class__
+        cls_name = cls.__name__
+        module_name = getattr(cls, "__module__", "")
+        if "pydantic" in module_name.lower() or "basemodel" in cls_name.lower():
+            return True
+    
+    return False
+
+def is_json_serializable(obj: Any) -> bool:
+    """Check if an object can be serialized to JSON."""
+    try:
+        json.dumps(obj)
+        return True
+    except (TypeError, ValueError):
+        return False
+
+def pydantic_to_dict(obj: Any) -> Any:
+    """
+    Recursively convert Pydantic models to dictionaries.
+    Works with nested models, lists, and dictionaries containing models.
+    Falls back to string representation if object can't be serialized.
+    """
+    if obj is None:
+        return None
+        
+    if is_pydantic_model(obj):
+        # Handle Pydantic v2 models
+        if hasattr(obj, "model_dump"):
+            return obj.model_dump()
+        # Handle Pydantic v1 models
+        elif hasattr(obj, "dict"):
+            return obj.dict()
+        # Last resort - try __dict__ if it exists
+        elif hasattr(obj, "__dict__"):
+            return {k: pydantic_to_dict(v) for k, v in obj.__dict__.items() 
+                   if not k.startswith("_")}
+    
+    elif isinstance(obj, dict):
+        # Handle dictionaries that might contain Pydantic models
+        return {k: pydantic_to_dict(v) for k, v in obj.items()}
+    
+    elif isinstance(obj, list):
+        # Handle lists that might contain Pydantic models
+        return [pydantic_to_dict(item) for item in obj]
+    
+    elif isinstance(obj, tuple) and hasattr(obj, '_fields'):
+        # Handle namedtuples
+        return dict(zip(obj._fields, (pydantic_to_dict(item) for item in obj)))
+    
+    elif isinstance(obj, (list, tuple)):
+        # Handle regular lists and tuples
+        return [pydantic_to_dict(item) for item in obj]
+    
+    # Final check - if object is not JSON serializable, convert to string
+    if not is_json_serializable(obj):
+        try:
+            return str(obj)
+        except Exception:
+            return f"<Unserializable object of type {type(obj).__name__}>"
+    
+    # Return other types unchanged - these should be JSON serializable by default
+    return obj 

flock/webapp/run.py

@@ -0,0 +1,30 @@
+import sys
+from pathlib import Path
+
+import uvicorn
+
+
+def main():
+    """Run the Flock web application."""
+    # Ensure the webapp directory is in the Python path
+    webapp_dir = Path(__file__).resolve().parent
+    if str(webapp_dir) not in sys.path:
+        sys.path.insert(0, str(webapp_dir.parent.parent))  # Add 'src' to path
+
+    try:
+        uvicorn.run(
+            "flock.webapp.app.main:app",
+            host="127.0.0.1",
+            port=8344,
+            reload=True,
+        )
+    except ModuleNotFoundError as e:
+        print(f"Error loading webapp modules: {e}")
+        print(
+            "Make sure all required packages are installed and module structure is correct."
+        )
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()