10xscale-agentflow-cli 0.1.8__tar.gz → 0.2.0__tar.gz

{10xscale_agentflow_cli-0.1.8 → 10xscale_agentflow_cli-0.2.0}/10xscale_agentflow_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: 10xscale-agentflow-cli
-Version: 0.1.8
+Version: 0.2.0
 Summary: CLI and API for 10xscale AgentFlow
 Author-email: 10xscale <contact@10xscale.ai>
 Maintainer-email: Shudipto Trafder <shudiptotrafder@gmail.com>
@@ -21,7 +21,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Internet :: WWW/HTTP :: HTTP Servers
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
-Requires-Dist: 10xscale-agentflow>=0.4.0
+Requires-Dist: 10xscale-agentflow>=0.5.0
 Requires-Dist: fastapi
 Requires-Dist: gunicorn
 Requires-Dist: orjson

{10xscale_agentflow_cli-0.1.8 → 10xscale_agentflow_cli-0.2.0}/10xscale_agentflow_cli.egg-info/requires.txt

@@ -1,4 +1,4 @@
-10xscale-agentflow>=0.4.0
+10xscale-agentflow>=0.5.0
 fastapi
 gunicorn
 orjson

{10xscale_agentflow_cli-0.1.8 → 10xscale_agentflow_cli-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: 10xscale-agentflow-cli
-Version: 0.1.8
+Version: 0.2.0
 Summary: CLI and API for 10xscale AgentFlow
 Author-email: 10xscale <contact@10xscale.ai>
 Maintainer-email: Shudipto Trafder <shudiptotrafder@gmail.com>
@@ -21,7 +21,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Internet :: WWW/HTTP :: HTTP Servers
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
-Requires-Dist: 10xscale-agentflow>=0.4.0
+Requires-Dist: 10xscale-agentflow>=0.5.0
 Requires-Dist: fastapi
 Requires-Dist: gunicorn
 Requires-Dist: orjson

{10xscale_agentflow_cli-0.1.8 → 10xscale_agentflow_cli-0.2.0}/agentflow_cli/src/app/core/auth/jwt_auth.py

@@ -44,6 +44,11 @@ class JwtAuth(BaseAuth):
         jwt_secret_key = os.environ.get("JWT_SECRET_KEY", None)
         jwt_algorithm = os.environ.get("JWT_ALGORITHM", None)
 
+        # check bearer token then remove barer prefix
+        token = credential.credentials
+        if token.lower().startswith("bearer "):
+            token = token[7:]
+
         if jwt_secret_key is None or jwt_algorithm is None:
             raise UserAccountError(
                 message="JWT settings are not configured",
@@ -52,7 +57,7 @@ class JwtAuth(BaseAuth):
 
         try:
             decoded_token = jwt.decode(
-                credential.credentials,
+                token,
                 jwt_secret_key,  # type: ignore
                 algorithms=[jwt_algorithm],  # type: ignore
             )

{10xscale_agentflow_cli-0.1.8 → 10xscale_agentflow_cli-0.2.0}/agentflow_cli/src/app/core/exceptions/handle_errors.py

@@ -4,7 +4,6 @@ from agentflow.exceptions import (
     GraphRecursionError,
     MetricsError,
     NodeError,
-    ResourceNotFoundError,
     SchemaVersionError,
     SerializationError,
     StorageError,
@@ -40,7 +39,7 @@ def init_errors_handler(app: FastAPI):
         ValueError: Handles value errors.
         UserAccountError: Handles custom user account errors.
         UserPermissionError: Handles custom user permission errors.
-        ResourceNotFoundError: Handles custom resource not found errors.
+        APIResourceNotFoundError: Handles custom API resource not found errors.
     """
 
     @app.exception_handler(HTTPException)
@@ -208,16 +207,3 @@ def init_errors_handler(app: FastAPI):
             details=getattr(exc, "context", None),
             status_code=503,
         )
-
-    @app.exception_handler(ResourceNotFoundError)
-    async def resource_not_found_storage_exception_handler(
-        request: Request, exc: ResourceNotFoundError
-    ):
-        logger.error(f"ResourceNotFoundError: url: {request.base_url}", exc_info=exc)
-        return error_response(
-            request,
-            error_code=getattr(exc, "error_code", "RESOURCE_NOT_FOUND_000"),
-            message=getattr(exc, "message", str(exc)),
-            details=getattr(exc, "context", None),
-            status_code=404,
-        )

{10xscale_agentflow_cli-0.1.8 → 10xscale_agentflow_cli-0.2.0}/agentflow_cli/src/app/loader.py

@@ -202,6 +202,14 @@ async def attach_all_modules(
                 path,
             )
             container.bind_instance(BaseAuth, auth_backend)
+        elif method == "jwt":
+            from agentflow_cli.src.app.core.auth.jwt_auth import JwtAuth
+
+            jwt_auth = JwtAuth()
+            container.bind_instance(BaseAuth, jwt_auth)
+
+        elif method == "none":
+            container.bind_instance(BaseAuth, None, allow_none=True)
     else:
         # bind None
         container.bind_instance(BaseAuth, None, allow_none=True)

{10xscale_agentflow_cli-0.1.8 → 10xscale_agentflow_cli-0.2.0}/agentflow_cli/src/app/routers/checkpointer/services/checkpointer_service.py

@@ -174,7 +174,8 @@ class CheckpointerService:
         base: dict[str, Any] = {}
         if old_state is not None:
             # Keep full dump so we can preserve existing fields
-            base = old_state.model_dump()
+            # Use serialize_as_any=True to include subclass fields
+            base = old_state.model_dump(serialize_as_any=True)
 
         merged: dict[str, Any] = {**base}
 

{10xscale_agentflow_cli-0.1.8 → 10xscale_agentflow_cli-0.2.0}/agentflow_cli/src/app/routers/graph/services/graph_service.py

@@ -247,7 +247,7 @@ class GraphService:
 
             return GraphInvokeOutputSchema(
                 messages=messages,
-                state=raw_state.model_dump() if raw_state else None,
+                state=raw_state.model_dump(serialize_as_any=True) if raw_state else None,
                 context=context,
                 summary=context_summary,
                 meta=meta,
@@ -295,7 +295,7 @@ class GraphService:
                 mt = chunk.metadata or {}
                 mt.update(meta)
                 chunk.metadata = mt
-                yield chunk.model_dump_json()
+                yield chunk.model_dump_json(serialize_as_any=True)
                 if (
                     self.config.thread_name_generator_path
                     and meta["is_new_thread"]
@@ -308,7 +308,6 @@ class GraphService:
             logger.info("Graph streaming completed successfully")
 
             if meta["is_new_thread"] and self.config.thread_name_generator_path:
-                messages_str = [msg.text() for msg in messages_str]
                 thread_name = await self._save_thread_name(
                     config, config["thread_id"], messages_str
                 )
@@ -318,7 +317,7 @@ class GraphService:
                     event=StreamEvent.UPDATES,
                     data={"status": "completed"},
                     metadata=meta,
-                ).model_dump_json()
+                ).model_dump_json(serialize_as_any=True)
 
         except Exception as e:
             logger.error(f"Graph streaming failed: {e}")
@@ -344,6 +343,25 @@ class GraphService:
             logger.error(f"Failed to get state schema: {e}")
             raise HTTPException(status_code=500, detail=f"Failed to get state schema: {e!s}")
 
+    def _has_empty_tool_call(self, msg: Message) -> bool:
+        """Return True if any tool call on the message has empty content.
+
+        A tool call is considered empty if its ``content`` attribute/key is ``None`` or
+        an empty string. Tool calls may be dict-like or objects with a ``content`` attribute.
+        """
+        tool_calls = getattr(msg, "tools_calls", None)
+        if not tool_calls:
+            return False
+        for tool_call in tool_calls:
+            content = (
+                tool_call.get("content")
+                if isinstance(tool_call, dict)
+                else getattr(tool_call, "content", None)
+            )
+            if content in (None, ""):
+                return True
+        return False
+
     async def fix_graph(
         self,
         thread_id: str,
@@ -372,66 +390,54 @@ class GraphService:
         Raises:
             HTTPException: If the operation fails
         """
+        try:
+            logger.info(f"Starting fix graph operation for thread: {thread_id}")
+            logger.debug(f"User info: {user}")
 
-        logger.info(f"Starting fix graph operation for thread: {thread_id}")
-        logger.debug(f"User info: {user}")
-
-        fix_config = {
-            "thread_id": thread_id,
-            "user": user,
-        }
-
-        # Merge additional config if provided
-        if config:
-            fix_config.update(config)
-
-        logger.debug("Fetching current state from checkpointer")
-        state: AgentState | None = await self.checkpointer.aget_state(fix_config)
+            fix_config = {"thread_id": thread_id, "user": user}
+            if config:
+                fix_config.update(config)
+
+            logger.debug("Fetching current state from checkpointer")
+            state: AgentState | None = await self.checkpointer.aget_state(fix_config)
+            if not state:
+                logger.warning(f"No state found for thread: {thread_id}")
+                return {
+                    "success": False,
+                    "message": f"No state found for thread: {thread_id}",
+                    "removed_count": 0,
+                    "state": None,
+                }
 
-        if not state:
-            logger.warning(f"No state found for thread: {thread_id}")
-            return {
-                "success": False,
-                "message": f"No state found for thread: {thread_id}",
-                "removed_count": 0,
-                "state": None,
-            }
+            messages: list[Message] = list(state.context or [])
+            logger.debug(f"Found {len(messages)} messages in state")
+            if not messages:
+                return {
+                    "success": True,
+                    "message": "No messages found in state",
+                    "removed_count": 0,
+                    "state": state.model_dump_json(serialize_as_any=True),
+                }
 
-        messages: list[Message] = state.context
-        logger.debug(f"Found {len(messages)} messages in state")
+            filtered = [m for m in messages if not self._has_empty_tool_call(m)]
+            removed_count = len(messages) - len(filtered)
 
-        if not messages:
-            logger.info("No messages found in state, nothing to fix")
-            return {
-                "success": True,
-                "message": "No messages found in state",
-                "removed_count": 0,
-                "state": state.model_dump_json(),
-            }
+            if removed_count:
+                state.context = filtered
+                await self.checkpointer.aput_state(fix_config, state)
+                message = f"Successfully removed {removed_count} message(s)"
+            else:
+                message = "No messages with empty tool calls found"
 
-        last_message = messages[-1]
-        updated_context = []
-        if last_message.role == "assistant" and last_message.tools_calls:
-            updated_context = messages[:-1]
-            state.context = updated_context
-            await self.checkpointer.aput_state(fix_config, state)
             return {
                 "success": True,
-                "message": "Removed last assistant message with empty tool calls",
-                "removed_count": 1,
-                "state": state.model_dump_json(),
+                "message": message,
+                "removed_count": removed_count,
+                "state": state.model_dump_json(serialize_as_any=True),
             }
-        else:
-            logger.warning(
-                "Last message is not an assistant message with tool calls, skipping it from checks."
-            )
-
-        return {
-            "success": True,
-            "message": "No messages with empty tool calls found",
-            "removed_count": 0,
-            "state": state.model_dump_json(),
-        }
+        except Exception as e:
+            logger.error(f"Fix graph operation failed: {e}")
+            raise HTTPException(status_code=500, detail=f"Fix graph operation failed: {e!s}")
 
     async def setup(self, data: GraphSetupSchema) -> dict:
         # lets create tools

{10xscale_agentflow_cli-0.1.8 → 10xscale_agentflow_cli-0.2.0}/agentflow_cli/src/app/utils/parse_output.py

@@ -7,11 +7,11 @@ from agentflow_cli.src.app.core.config.settings import Settings
 
 def parse_state_output(settings: Settings, response: BaseModel) -> dict[str, Any]:
     # if settings.IS_DEBUG:
-    #     return response.model_dump(exclude={"execution_meta"})
-    return response.model_dump()
+    #     return response.model_dump(exclude={"execution_meta"}, serialize_as_any=True)
+    return response.model_dump(serialize_as_any=True)
 
 
 def parse_message_output(settings: Settings, response: BaseModel) -> dict[str, Any]:
     # if settings.IS_DEBUG:
-    #     return response.model_dump(exclude={"raw"})
-    return response.model_dump()
+    #     return response.model_dump(exclude={"raw"}, serialize_as_any=True)
+    return response.model_dump(serialize_as_any=True)

{10xscale_agentflow_cli-0.1.8 → 10xscale_agentflow_cli-0.2.0}/graph/react.py

@@ -1,37 +1,3 @@
-"""
-Graph-based React Agent Implementation
-
-This module implements a reactive agent system using PyAgenity's StateGraph.
-The agent can interact with tools (like weather checking) and maintain conversation
-state through a checkpointer. The graph orchestrates the flow between the main
-agent logic and tool execution.
-
-Key Components:
-- Weather tool: Demonstrates tool calling with dependency injection
-- Main agent: AI-powered assistant that can use tools
-- Graph flow: Conditional routing based on tool usage
-- Checkpointer: Maintains conversation state across interactions
-
-Architecture:
-The system uses a state graph with two main nodes:
-1. MAIN: Processes user input and generates AI responses
-2. TOOL: Executes tool calls when requested by the AI
-
-The graph conditionally routes between these nodes based on whether
-the AI response contains tool calls. Conversation history is maintained
-through the checkpointer, allowing for multi-turn conversations.
-
-Tools are defined as functions with JSON schema docstrings that describe
-their interface for the AI model. The ToolNode automatically extracts
-these schemas for tool selection.
-
-Dependencies:
-- PyAgenity: For graph and state management
-- LiteLLM: For AI model interactions
-- InjectQ: For dependency injection
-- Python logging: For debug and info messages
-"""
-
 import logging
 from typing import Any
 
@@ -70,46 +36,6 @@ class MyAgentState(AgentState):
 checkpointer = InMemoryCheckpointer[MyAgentState]()
 
 
-"""
-Note: The docstring below will be used as the tool description and it will be
-passed to the AI model for tool selection, so keep it relevant and concise.
-This function will be converted to a tool with the following schema:
-[
-        {
-            'type': 'function',
-            'function': {
-                'name': 'get_weather',
-                'description': 'Retrieve current weather information for a specified location.',
-                'parameters': {
-                    'type': 'object',
-                    'properties': {
-                        'location': {'type': 'string'}
-                    },
-                    'required': ['location']
-                }
-            }
-        }
-    ]
-
-Parameters like tool_call_id, state, and checkpointer are injected automatically
-by InjectQ when the tool is called by the agent.
-Available injected parameters:
-The following parameters are automatically injected by InjectQ when the tool is called,
-but need to keep them as same name and type for proper injection:
-- tool_call_id: Unique ID for the tool call
-- state: Current AgentState containing conversation context
-- config: Configuration dictionary passed during graph invocation
-
-Below fields need to be used with Inject[] to get the instances:
-- context_manager: ContextManager instance for managing context, like trimming
-- publisher: Publisher instance for publishing events and logs
-- checkpointer: InMemoryCheckpointer instance for state management
-- store: InMemoryStore instance for temporary data storage
-- callback: CallbackManager instance for handling callbacks
-
-"""
-
-
 def get_weather(
     location: str,
     tool_call_id: str,

{10xscale_agentflow_cli-0.1.8 → 10xscale_agentflow_cli-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "10xscale-agentflow-cli"
-version = "0.1.8"
+version = "0.2.0"
 description = "CLI and API for 10xscale AgentFlow"
 readme = "README.md"
 license = {text = "MIT"}
@@ -34,7 +34,7 @@ classifiers = [
     "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
 ]
 dependencies = [
-    "10xscale-agentflow>=0.4.0",
+    "10xscale-agentflow>=0.5.0",
     "fastapi",
     "gunicorn",
     "orjson",

{10xscale_agentflow_cli-0.1.8 → 10xscale_agentflow_cli-0.2.0}/tests/test_utils_parse_and_callable.py

@@ -28,9 +28,7 @@ def test_parse_state_output(is_debug: bool):
     settings = Settings(IS_DEBUG=is_debug)
     model = _StateModel(a=1, b="x", execution_meta={"duration": 123})
     out = parse_state_output(settings, model)
-    # execution_meta excluded only in debug mode per implementation
-    # Since parse_state_output doesn't filter execution_meta (commented out),
-    # it should always be present regardless of debug mode
+    # Current implementation always includes execution_meta regardless of debug
     assert out["execution_meta"] == {"duration": 123}
     assert out["a"] == 1 and out["b"] == "x"
 
@@ -40,8 +38,7 @@ def test_parse_message_output(is_debug: bool):
     settings = Settings(IS_DEBUG=is_debug)
     model = _MessageModel(content="hello", raw={"tokens": 5})
     out = parse_message_output(settings, model)
-    # Since parse_message_output doesn't filter raw (commented out),
-    # it should always be present regardless of debug mode
+    # Current implementation always includes raw regardless of debug
     assert out["raw"] == {"tokens": 5}
     assert out["content"] == "hello"