Dep agent_core

Author: maxDcb

C2Client/C2Client/assistant_agent/bootstrap.py

@@ -2,10 +2,6 @@
 
 from typing import Any
 
-from ..bootstrap import ensure_agent_core_path
-
-ensure_agent_core_path()
-
 from agent_core import DomainHooks
 
 

C2Client/C2Client/assistant_agent/domain/hooks.py

@@ -3,13 +3,10 @@
 from pathlib import Path
 from typing import Any
 
-from ..bootstrap import ensure_agent_core_path
 from ..tools.registry import build_c2_tool_registry
 from .hooks import C2DomainHooks
 from .settings import build_c2_agent_settings
 
-ensure_agent_core_path()
-
 from agent_core import AgentOrchestrator, AgentTurnResult, PolicyEngine, SessionManager, SessionRepository
 from agent_core.llm.openai_provider import OpenAIProvider
 

C2Client/C2Client/assistant_agent/domain/service.py

@@ -3,11 +3,8 @@
 import os
 from pathlib import Path
 
-from ..bootstrap import ensure_agent_core_path
 from ..storage.paths import default_storage_dir, prompts_dir
 
-ensure_agent_core_path()
-
 from agent_core import CoreSettings
 from agent_core.prompt_repository import load_prompt
 

C2Client/C2Client/assistant_agent/domain/settings.py

@@ -4,12 +4,9 @@
 from dataclasses import dataclass
 from typing import Any
 
-from ..bootstrap import ensure_agent_core_path
 from .command_builder import build_command_line
 from .loader import C2ToolSpec
 
-ensure_agent_core_path()
-
 from agent_core.execution_context import ExecutionContext
 from agent_core.llm.base import LLMToolDefinition
 from agent_core.tools import build_tool_definition

C2Client/C2Client/assistant_agent/tools/command_tool.py

@@ -3,12 +3,9 @@
 from pathlib import Path
 from typing import Any
 
-from ..bootstrap import ensure_agent_core_path
 from .command_tool import C2CommandTool
 from .loader import load_tool_specs
 
-ensure_agent_core_path()
-
 from agent_core import ToolRegistry
 
 

C2Client/C2Client/assistant_agent/tools/registry.py

@@ -18,6 +18,7 @@ dependencies = [
     "pwn==1.0",
     "pefile==2024.8.26",
     "openai==1.102.0",
+    "agent-core @ git+https://github.com/maxDcb/agent-core.git@main",
     "donut-shellcode @ git+https://github.com/maxDcb/donut.git@master",
     "markdown"
 ]
@@ -29,8 +30,8 @@ test = [
 ]
 
 [tool.setuptools.packages.find]
-where = [".", "vendor/PentestAssistant"]
-include = ["C2Client*", "C2Client.TerminalModules.*", "agent_core*"]
+where = ["."]
+include = ["C2Client*"]
 
 [tool.setuptools.package-data]
 C2Client = [
@@ -44,7 +45,6 @@ C2Client = [
     "assistant_agent/prompts/memory/*.md",
     "assistant_agent/tools/schemas/*.json"
 ]
-agent_core = ["py.typed"]
 
 [project.scripts]
 c2client = "C2Client.GUI:main"  # Entry point for CLI tool

C2Client/pyproject.toml

@@ -8,6 +8,7 @@ requests==2.33.0
 pwn==1.0
 pefile==2024.8.26
 openai==1.102.0
+agent-core @ git+https://github.com/maxDcb/agent-core.git@main
 pytest==9.0.3
 pytest-qt==4.5.0
 git+https://github.com/maxDcb/donut.git@master#egg=donut-shellcode

C2Client/requirements.txt

@@ -1,12 +1,6 @@
 from __future__ import annotations
 
 import json
-import sys
-from pathlib import Path
-
-VENDOR_ROOT = Path(__file__).resolve().parents[2] / "vendor" / "PentestAssistant"
-if str(VENDOR_ROOT) not in sys.path:
-    sys.path.insert(0, str(VENDOR_ROOT))
 
 from agent_core.llm.base import LLMCompletionResult, LLMToolCall
 from agent_core.orchestrator import AgentOrchestrator