8b- models optimizations (#29)

* Refactor system prompt and tool discriminator logic

* Update base_agent.py

* lint

Author: virrius

README.md

@@ -12,13 +12,13 @@ Production-ready open-source system for automated research using Schema-Guided R
 
 ## 📊 Summary Table of Agents
 
-| Agent                   | SGR Implementation | ReasoningTool        | Tools                 | API Requests | Selection Mechanism |
-| ----------------------- | ------------------ | -------------------- | --------------------- | ------------ | ------------------- |
-| **1. SGR-Agent**        | Structured Output  | ❌ Built into schema | 6 basic               | 1            | SO Union Type       |
-| **2. FCAgent**          | ❌ Absent          | ❌ Absent            | 6 basic               | 1            | FC "required"       |
-| **3. HybridSGRAgent**   | FC Tool enforced   | ✅ First step FC     | 7 (6 + ReasoningTool) | 2            | FC → FC    TOP AGENT|
-| **4. OptionalSGRAgent** | FC Tool optional   | ✅ At model’s choice | 7 (6 + ReasoningTool) | 1–2          | FC "auto"           |
-| **5. ReasoningFC_SO**   | FC → SO → FC auto  | ✅ FC enforced       | 7 (6 + ReasoningTool) | 3            | FC → SO → FC auto   |
+| Agent                   | SGR Implementation | ReasoningTool        | Tools                 | API Requests | Selection Mechanism  |
+| ----------------------- | ------------------ | -------------------- | --------------------- | ------------ | -------------------- |
+| **1. SGR-Agent**        | Structured Output  | ❌ Built into schema | 6 basic               | 1            | SO Union Type        |
+| **2. FCAgent**          | ❌ Absent          | ❌ Absent            | 6 basic               | 1            | FC "required"        |
+| **3. HybridSGRAgent**   | FC Tool enforced   | ✅ First step FC     | 7 (6 + ReasoningTool) | 2            | FC → FC    TOP AGENT |
+| **4. OptionalSGRAgent** | FC Tool optional   | ✅ At model’s choice | 7 (6 + ReasoningTool) | 1–2          | FC "auto"            |
+| **5. ReasoningFC_SO**   | FC → SO → FC auto  | ✅ FC enforced       | 7 (6 + ReasoningTool) | 3            | FC → SO → FC auto    |
 
 ## 👥 Open-Source Development Team
 

sgr_deep_research/core/agents/base_agent.py

@@ -122,8 +122,8 @@ def _save_agent_log(self):
         filepath = os.path.join(logs_dir, f"{datetime.now().strftime('%Y%m%d-%H%M%S')}-{self.id}-log.json")
         agent_log = {
             "id": self.id,
+            "model_config": config.openai.model_dump(exclude={"api_key", "proxy"}),
             "task": self.task,
-            "context": self._context.agent_state(),
             "log": self.log,
         }
 
@@ -132,7 +132,6 @@ def _save_agent_log(self):
     async def _prepare_context(self) -> list[dict]:
         """Prepare conversation context with system prompt."""
         system_prompt = PromptLoader.get_system_prompt(
-            user_request=self.task,
             sources=list(self._context.sources.values()),
             available_tools=self.toolkit,
         )

sgr_deep_research/core/prompts.py

@@ -27,17 +27,17 @@ def _load_prompt_file(cls, filename: str) -> str:
         raise FileNotFoundError(f"Prompt file not found: {user_file_path} or {lib_file_path}")
 
     @classmethod
-    def get_system_prompt(cls, user_request: str, sources: list[SourceData], available_tools: list[BaseTool]) -> str:
+    def get_system_prompt(cls, sources: list[SourceData], available_tools: list[BaseTool]) -> str:
         sources_formatted = "\n".join([str(source) for source in sources])
         template = cls._load_prompt_file(config.prompts.system_prompt_file)
         available_tools_str_list = [
             f"{i}. {tool.tool_name}: {tool.description}" for i, tool in enumerate(available_tools, start=1)
         ]
         try:
             return template.format(
-                current_date=datetime.now().strftime("%Y-%m-%d-%H:%M:%S"),
+                current_date=datetime.now().strftime("%d-%m-%Y %H:%M:%S"),
+                date_format="d-m-Y HH:MM:SS",
                 available_tools="\n".join(available_tools_str_list),
-                user_request=user_request,
                 sources_formatted=sources_formatted,
             )
         except KeyError as e:

sgr_deep_research/core/tools/base.py

@@ -9,14 +9,13 @@
 from pydantic import BaseModel, Field, create_model
 
 from sgr_deep_research.core.models import AgentStatesEnum
-from sgr_deep_research.settings import get_config
 
 if TYPE_CHECKING:
     from sgr_deep_research.core.models import ResearchContext
 
+
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
-config = get_config()
 
 
 class BaseTool(BaseModel):
@@ -136,6 +135,10 @@ class NextStepToolStub(ReasoningTool, ABC):
     function: T = Field(description="Select the appropriate tool for the next step")
 
 
+class DiscriminantToolMixin(BaseModel):
+    tool_name_discriminator: str = Field(..., description="Tool name discriminator")
+
+
 class NextStepToolsBuilder:
     """SGR Core - Builder for NextStepTool with dynamic union tool function type on
     pydantic models level."""
@@ -144,19 +147,12 @@ class NextStepToolsBuilder:
     def _create_discriminant_tool(cls, tool_class: Type[T]) -> Type[BaseModel]:
         """Create discriminant version of tool with tool_name as instance
         field."""
-        tool_name = tool_class.tool_name
 
-        discriminant_tool = create_model(
+        return create_model(
             f"{tool_class.__name__}WithDiscriminant",
-            __base__=tool_class,
-            tool_name_discriminator=(
-                Literal[tool_name],  # noqa
-                Field(default=tool_name, description="Tool name discriminator"),
-            ),
-        )
-        discriminant_tool.__call__ = tool_class.__call__
-
-        return discriminant_tool
+            __base__=(tool_class, DiscriminantToolMixin),  # the order matters here
+            tool_name_discriminator=(Literal[tool_class.tool_name], Field(..., description="Tool name discriminator")),
+        )  # noqa
 
     @classmethod
     def _create_tool_types_union(cls, tools_list: list[Type[T]]) -> Type:

sgr_deep_research/prompts/system_prompt.txt

@@ -1,7 +1,7 @@
 You are an expert researcher with adaptive planning and Schema-Guided Reasoning capabilities.
 
-USER REQUEST: "{user_request}"
-CURRENT DATE: {current_date}
+CURRENT DATE:{current_date} format: {date_format}
+
 IMPORTANT: Detect the language from this request and use THE SAME LANGUAGE for all responses, searches, and reports.
 
 CORE PRINCIPLES:
@@ -12,9 +12,6 @@ CORE PRINCIPLES:
 5. REPORT ENTIRELY in SAME LANGUAGE as user request
 6. Every fact in report MUST have inline citation [1], [2], [3] integrated into sentences
 
-WORKFLOW:
-{available_tools}
-
 ADAPTIVITY: Actively change plan when discovering new data.
 
 LANGUAGE ADAPTATION: Always respond and create reports in the SAME LANGUAGE as the user's request.
@@ -46,3 +43,9 @@ FULL LIST OF AVAILABLE SOURCES FOR CITATIONS:
 {sources_formatted}
 
 USE THESE EXACT NUMBERS [1], [2], [3] etc. in your report citations.
+
+You may call one or more functions to assist with the user query.
+You are provided with function signatures within <tools></tools> XML tags:
+<tools>
+{available_tools}
+</tools>