emdash-core 0.1.53__tar.gz → 0.1.68__tar.gz

{emdash_core-0.1.53 → emdash_core-0.1.68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emdash-core
-Version: 0.1.53
+Version: 0.1.68
 Summary: EmDash Core - FastAPI server for code intelligence
 Author: Em Dash Team
 Requires-Python: >=3.10,<4.0
@@ -10,16 +10,15 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Provides-Extra: graph
 Requires-Dist: astroid (>=3.0.1,<4.0.0)
 Requires-Dist: beautifulsoup4 (>=4.12.0)
 Requires-Dist: claude-agent-sdk (>=0.1.19)
-Requires-Dist: cmake (>=3.25.0) ; extra == "graph"
+Requires-Dist: cmake (>=3.25.0)
 Requires-Dist: duckduckgo-search (>=6.0.0)
 Requires-Dist: fastapi (>=0.109.0)
 Requires-Dist: gitpython (>=3.1.40,<4.0.0)
 Requires-Dist: httpx (>=0.25.0)
-Requires-Dist: kuzu (>=0.4.0) ; extra == "graph"
+Requires-Dist: kuzu (>=0.4.0)
 Requires-Dist: loguru (>=0.7.2,<0.8.0)
 Requires-Dist: networkx (>=3.2.1,<4.0.0)
 Requires-Dist: numpy (>=1.26.0)
@@ -27,6 +26,7 @@ Requires-Dist: openai (>=1.0.0)
 Requires-Dist: pydantic (>=2.5.0,<3.0.0)
 Requires-Dist: pydantic-settings (>=2.0.0,<3.0.0)
 Requires-Dist: pygithub (>=2.1.1,<3.0.0)
+Requires-Dist: pyobjc-framework-Cocoa (>=9.0) ; sys_platform == "darwin"
 Requires-Dist: pypng (>=0.0.21,<0.0.22)
 Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
 Requires-Dist: python-louvain (>=0.16,<0.17)

{emdash_core-0.1.53 → emdash_core-0.1.68}/emdash_core/agent/providers/models.py

@@ -111,7 +111,7 @@ class ChatModel(Enum):
         context_window=1000000,
         max_output_tokens=16384,
         supports_tools=True,
-        supports_vision=False,
+        supports_vision=False,  # Fireworks deployment doesn't expose vision
         supports_thinking=False,
         description="MiniMax M2P1 - Long context model",
     )

{emdash_core-0.1.53 → emdash_core-0.1.68}/emdash_core/agent/providers/openai_provider.py

@@ -139,6 +139,8 @@ class OpenAIProvider(LLMProvider):
         self._thinking_budget = int(os.environ.get("EMDASH_THINKING_BUDGET", "10000"))
         # Reasoning effort for Fireworks thinking models: none, low, medium, high
         self._reasoning_effort = os.environ.get("EMDASH_REASONING_EFFORT", "medium")
+        # Parallel tool calls for OpenAI-compatible APIs (Fireworks supports this)
+        self._parallel_tool_calls = self._parse_bool_env("EMDASH_PARALLEL_TOOL_CALLS")
 
         # Use OPENAI_BASE_URL env var only for OpenAI provider, otherwise use provider config
         if self._provider == "openai":
@@ -244,6 +246,14 @@ class OpenAIProvider(LLMProvider):
         if tools:
             kwargs["tools"] = tools
             kwargs["tool_choice"] = "auto"
+            # Add parallel_tool_calls if enabled (Fireworks and OpenAI support this)
+            if self._parallel_tool_calls is True:
+                kwargs["parallel_tool_calls"] = True
+                log.debug(
+                    "Parallel tool calls enabled provider={} model={}",
+                    self._provider,
+                    self.model,
+                )
 
         # Add reasoning support via extra_body for providers that support it
         # Skip reasoning for custom base URLs (they may not support it)

{emdash_core-0.1.53 → emdash_core-0.1.68}/emdash_core/agent/runner/agent_runner.py

@@ -310,24 +310,27 @@ class AgentRunner(PlanMixin):
         from ..tools.modes import ModeState
         ModeState.get_instance().reset_cycle()
 
-        # Build user message
+        # Build user message content
         if context:
-            user_message = {
-                "role": "user",
-                "content": f"Context:\n{context}\n\nQuestion: {query}",
-            }
+            text_content = f"Context:\n{context}\n\nQuestion: {query}"
         else:
-            user_message = {
-                "role": "user",
-                "content": query,
-            }
+            text_content = query
+
+        # Format content with images if provided
+        if images:
+            content = self.provider.format_content_with_images(text_content, images)
+        else:
+            content = text_content
+
+        user_message = {
+            "role": "user",
+            "content": content,
+        }
 
         # Save user message to history BEFORE running (so it's preserved even if interrupted)
         self._messages.append(user_message)
         messages = list(self._messages)  # Copy for the loop
 
-        # TODO: Handle images if provided
-
         # Get tool schemas
         tools = self.toolkit.get_all_schemas()
 
@@ -790,13 +793,26 @@ DO NOT output more text. Use a tool NOW.""",
             # No history, just run fresh
             return self.run(message, images=images)
 
+        # Reset per-cycle mode state (allows exit_plan to be called again)
+        # This is critical for plan mode - without this reset, if a clarification
+        # response comes in after exit_plan was called, plan_submitted would remain
+        # True and block subsequent exit_plan calls.
+        from ..tools.modes import ModeState
+        ModeState.get_instance().reset_cycle()
+
         # Store query for reranking context frame
         self._current_query = message
 
+        # Format content with images if provided
+        if images:
+            content = self.provider.format_content_with_images(message, images)
+        else:
+            content = message
+
         # Add new user message to history
         self._messages.append({
             "role": "user",
-            "content": message,
+            "content": content,
         })
 
         # Get tool schemas

{emdash_core-0.1.53 → emdash_core-0.1.68}/emdash_core/agent/runner/sdk_runner.py

@@ -184,11 +184,12 @@ class SDKAgentRunner:
             from ..events import EventType
             self.emitter.emit(getattr(EventType, event_type), data)
 
-    async def run(self, prompt: str) -> AsyncIterator[dict]:
+    async def run(self, prompt: str, images: list = None) -> AsyncIterator[dict]:
         """Execute agent with SDK.
 
         Args:
             prompt: User prompt/task
+            images: Optional list of image dicts with 'data' (bytes) and 'format' keys
 
         Yields:
             Event dicts for UI streaming
@@ -201,6 +202,7 @@ class SDKAgentRunner:
             ToolResultBlock,
             ResultMessage,
         )
+        import base64
 
         options = self._get_options()
 
@@ -210,9 +212,34 @@ class SDKAgentRunner:
             "agent_name": "Emdash Code (SDK)",
         })
 
+        # Format prompt with images if provided
+        if images:
+            # Build content blocks for Claude SDK
+            content_blocks = []
+            for img in images:
+                img_data = img.get("data")
+                img_format = img.get("format", "png")
+                if isinstance(img_data, bytes):
+                    encoded = base64.b64encode(img_data).decode("utf-8")
+                else:
+                    encoded = img_data  # Already base64 encoded
+                content_blocks.append({
+                    "type": "image",
+                    "source": {
+                        "type": "base64",
+                        "media_type": f"image/{img_format}",
+                        "data": encoded,
+                    }
+                })
+            content_blocks.append({"type": "text", "text": prompt})
+            query_content = content_blocks
+            log.info(f"SDK agent: sending {len(images)} images with prompt")
+        else:
+            query_content = prompt
+
         try:
             async with ClaudeSDKClient(options=options) as client:
-                await client.query(prompt)
+                await client.query(query_content)
 
                 async for message in client.receive_response():
                     # Process message and yield events

{emdash_core-0.1.53 → emdash_core-0.1.68}/emdash_core/api/agent.py

@@ -38,6 +38,7 @@ def _run_sdk_agent(
     session_id: str,
     emitter,
     plan_mode: bool = False,
+    images: list = None,
 ):
     """Run the agent using Anthropic Agent SDK.
 
@@ -72,7 +73,7 @@ def _run_sdk_agent(
     # Run async agent in sync context
     async def run_async():
         response_text = ""
-        async for event in runner.run(message):
+        async for event in runner.run(message, images=images):
             if event.get("type") == "text":
                 response_text += event.get("content", "")
         return response_text
@@ -154,6 +155,14 @@ def _run_agent_sync(
 
         # Use SDK for Claude models if enabled
         if use_sdk and is_claude_model(model):
+            # Convert images for SDK if provided
+            sdk_images = None
+            if images:
+                import base64
+                sdk_images = [
+                    {"data": base64.b64decode(img.data), "format": img.format}
+                    for img in images
+                ]
             return _run_sdk_agent(
                 message=message,
                 model=model,
@@ -161,6 +170,7 @@ def _run_agent_sync(
                 session_id=session_id,
                 emitter=emitter,
                 plan_mode=plan_mode,
+                images=sdk_images,
             )
 
         # Standard path: use AgentRunner with OpenAI-compatible API
@@ -251,9 +261,13 @@ def _run_agent_sync(
         # Convert image data if provided
         agent_images = None
         if images:
+            import base64
             from ..agent.providers.base import ImageContent
             agent_images = [
-                ImageContent(data=img.data, format=img.format)
+                ImageContent(
+                    image_data=base64.b64decode(img.data),
+                    format=img.format
+                )
                 for img in images
             ]
 

{emdash_core-0.1.53 → emdash_core-0.1.68}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "emdash-core"
-version = "0.1.53"
+version = "0.1.68"
 description = "EmDash Core - FastAPI server for code intelligence"
 authors = ["Em Dash Team"]
 packages = [{include = "emdash_core"}]
@@ -16,9 +16,9 @@ fastapi = ">=0.109.0"
 uvicorn = {extras = ["standard"], version = ">=0.27.0"}
 sse-starlette = ">=2.0.0"
 
-# Graph database (optional - requires C++ compilation on some platforms)
-cmake = {version = ">=3.25.0", optional = true}
-kuzu = {version = ">=0.4.0", optional = true}
+# Graph database
+cmake = ">=3.25.0"
+kuzu = ">=0.4.0"
 
 # LLM
 openai = ">=1.0.0"
@@ -54,8 +54,8 @@ tqdm = "^4.66.1"
 pypng = "^0.0.21"
 pyyaml = "^6.0"
 
-[tool.poetry.extras]
-graph = ["kuzu", "cmake"]
+# Clipboard (macOS only)
+pyobjc-framework-Cocoa = {version = ">=9.0", markers = "sys_platform == 'darwin'"}
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.3"