autobots-devtools-shared-lib 0.2.3a2__tar.gz → 0.3.2__tar.gz

{autobots_devtools_shared_lib-0.2.3a2 → autobots_devtools_shared_lib-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autobots-devtools-shared-lib
-Version: 0.2.3a2
+Version: 0.3.2
 Summary: Shared library functions to be used for all autobots projects
 License: MIT
 Author: Pralhad

{autobots_devtools_shared_lib-0.2.3a2 → autobots_devtools_shared_lib-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "autobots-devtools-shared-lib"
-version = "0.2.3-alpha.2"
+version = "0.3.2"
 description = "Shared library functions to be used for all autobots projects"
 readme = "README.md"
 authors = [

autobots_devtools_shared_lib-0.3.2/src/autobots_devtools_shared_lib/common/config/__init__.py

@@ -0,0 +1 @@
+# ABOUTME: Common configuration models and loaders shared across the framework.

autobots_devtools_shared_lib-0.2.3a2/src/autobots_devtools_shared_lib/common/jenkins/loader.py → autobots_devtools_shared_lib-0.3.2/src/autobots_devtools_shared_lib/common/config/jenkins_loader.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 
 import yaml
 
-from autobots_devtools_shared_lib.common.jenkins.config import JenkinsConfig
+from autobots_devtools_shared_lib.common.config.jenkins_config import JenkinsConfig
 from autobots_devtools_shared_lib.common.observability.logging_utils import get_logger
 
 logger = get_logger(__name__)

{autobots_devtools_shared_lib-0.2.3a2 → autobots_devtools_shared_lib-0.3.2}/src/autobots_devtools_shared_lib/common/services/__init__.py

@@ -3,7 +3,6 @@
 Provides converters, processors, and other utilities used by tools and agents,
 including:
 
-* StructuredOutputConverter - convert conversation history to structured output.
 * ContextStore - pluggable session-level context persistence.
 """
 
@@ -17,9 +16,6 @@ from autobots_devtools_shared_lib.common.services.context import (
     get_context_store,
     set_context_store,
 )
-from autobots_devtools_shared_lib.dynagent.services.structured_converter import (
-    StructuredOutputConverter,
-)
 
 __all__ = [
     "CacheBackedContextStore",
@@ -28,7 +24,6 @@ __all__ = [
     "DbRepository",
     "InMemoryContextStore",
     "RedisContextStore",
-    "StructuredOutputConverter",
     "get_context_store",
     "set_context_store",
 ]

{autobots_devtools_shared_lib-0.2.3a2 → autobots_devtools_shared_lib-0.3.2}/src/autobots_devtools_shared_lib/common/services/context/cache_backed.py

@@ -54,7 +54,7 @@ class CacheBackedContextStore:
         key = self._key(context_key)
         # Read from DB (not cache) to avoid acting on stale cache data
         current = self._db.get(key) or {}
-        updated = {**current, **dict(patch)}
+        updated = {**current, **{k: v for k, v in patch.items() if v is not None}}
         self._db.set(key, updated)
         self._cache.set(key, updated)
         return updated

{autobots_devtools_shared_lib-0.2.3a2 → autobots_devtools_shared_lib-0.3.2}/src/autobots_devtools_shared_lib/common/services/context/in_memory.py

@@ -20,8 +20,7 @@ class InMemoryContextStore:
 
     def update(self, context_key: str, patch: Mapping[str, Any]) -> dict[str, Any]:
         current = self._store.get(context_key, {})
-        # Create a shallow copy to avoid mutating the original dict outside this store
-        updated = {**current, **dict(patch)}
+        updated = {**current, **{k: v for k, v in patch.items() if v is not None}}
         self._store[context_key] = updated
         return updated
 

{autobots_devtools_shared_lib-0.2.3a2 → autobots_devtools_shared_lib-0.3.2}/src/autobots_devtools_shared_lib/common/services/context/redis_store.py

@@ -57,7 +57,7 @@ class RedisContextStore:
 
     def update(self, context_key: str, patch: Mapping[str, Any]) -> dict[str, Any]:
         current = self.get(context_key) or {}
-        updated = {**current, **dict(patch)}
+        updated = {**current, **{k: v for k, v in patch.items() if v is not None}}
         self.set(context_key, updated)
         return updated
 

autobots_devtools_shared_lib-0.3.2/src/autobots_devtools_shared_lib/common/tools/context_tools.py

@@ -0,0 +1,62 @@
+from typing import Any
+
+from langchain.tools import ToolRuntime, tool
+
+from autobots_devtools_shared_lib.common.utils.context_utils import (
+    clear_context,
+    get_context,
+    resolve_context_key,
+    set_context,
+    update_context,
+)
+from autobots_devtools_shared_lib.dynagent.models.state import Dynagent
+
+
+def make_context_tools(context_cls: type, state_cls: type = Dynagent) -> list[Any]:
+    """Return context tools (get/set/update/clear) typed to the given context and state schemas.
+
+    Args:
+        context_cls: Pydantic-compatible model (e.g. MerContextData) whose fields and
+                     Field(description=...) appear in the tool's JSON schema shown to the LLM.
+        state_cls:   Agent state TypedDict used to type the injected runtime parameter.
+                     Defaults to Dynagent. Invisible to the LLM.
+    """
+
+    def get_context_tool(runtime: ToolRuntime[None, Any]) -> dict[str, Any]:
+        """Return the current session context as a JSON-serializable dict."""
+        context_key = resolve_context_key(runtime.state)
+        return get_context(context_key)
+
+    get_context_tool.__annotations__["runtime"] = ToolRuntime[None, state_cls]
+
+    def set_context_tool(runtime: ToolRuntime[None, Any], data: dict[str, Any]) -> str:
+        """Replace the current session context with the provided data."""
+        context_key = resolve_context_key(runtime.state)
+        return set_context(context_key, dict(data))
+
+    set_context_tool.__annotations__["runtime"] = ToolRuntime[None, state_cls]
+    set_context_tool.__annotations__["data"] = context_cls
+
+    def update_context_tool(
+        runtime: ToolRuntime[None, Any], patch: dict[str, Any]
+    ) -> dict[str, Any]:
+        """Apply a partial update to the session context and return the new context."""
+        context_key = resolve_context_key(runtime.state)
+        return update_context(context_key, dict(patch))
+
+    update_context_tool.__annotations__["runtime"] = ToolRuntime[None, state_cls]
+    update_context_tool.__annotations__["patch"] = context_cls
+
+    def clear_context_tool(runtime: ToolRuntime[None, Any]) -> str:
+        """Clear any stored context for the current session."""
+        context_key = resolve_context_key(runtime.state)
+        return clear_context(context_key)
+
+    clear_context_tool.__annotations__["runtime"] = ToolRuntime[None, state_cls]
+
+    return [
+        tool(get_context_tool),
+        tool(set_context_tool),
+        tool(update_context_tool),
+        tool(clear_context_tool),
+    ]

autobots_devtools_shared_lib-0.2.3a2/src/autobots_devtools_shared_lib/common/jenkins/builtin_tools.py → autobots_devtools_shared_lib-0.3.2/src/autobots_devtools_shared_lib/common/tools/jenkins_builtin_tools.py

@@ -1,4 +1,4 @@
-# ABOUTME: Built-in generic Jenkins observability tools.
+# ABOUTME: Built-in generic Jenkins observability tools (LangChain @tool wrappers).
 # ABOUTME: Provides get_jenkins_build_status and get_jenkins_console_log.
 # ABOUTME: Call set_jenkins_config() once at startup before these tools are invoked.
 
@@ -9,11 +9,11 @@ from typing import TYPE_CHECKING
 import requests
 from langchain.tools import tool
 
-from autobots_devtools_shared_lib.common.jenkins.http_utils import get_auth
 from autobots_devtools_shared_lib.common.observability.logging_utils import get_logger
+from autobots_devtools_shared_lib.common.utils.jenkins_http_utils import get_auth
 
 if TYPE_CHECKING:
-    from autobots_devtools_shared_lib.common.jenkins.config import JenkinsConfig
+    from autobots_devtools_shared_lib.common.config.jenkins_config import JenkinsConfig
 
 logger = get_logger(__name__)
 

autobots_devtools_shared_lib-0.2.3a2/src/autobots_devtools_shared_lib/common/jenkins/tools.py → autobots_devtools_shared_lib-0.3.2/src/autobots_devtools_shared_lib/common/tools/jenkins_pipeline_tools.py

@@ -10,21 +10,21 @@ import requests
 from langchain_core.tools import StructuredTool
 from pydantic import BaseModel, Field, create_model
 
-from autobots_devtools_shared_lib.common.jenkins.builtin_tools import (
+from autobots_devtools_shared_lib.common.observability.logging_utils import get_logger
+from autobots_devtools_shared_lib.common.tools.jenkins_builtin_tools import (
     get_jenkins_build_status,
     get_jenkins_console_log,
     set_jenkins_config,
 )
-from autobots_devtools_shared_lib.common.jenkins.http_utils import (
+from autobots_devtools_shared_lib.common.utils.jenkins_http_utils import (
     extract_job_name_from_url,
     get_auth,
     poll_queue_for_build_number,
     wait_for_build,
 )
-from autobots_devtools_shared_lib.common.observability.logging_utils import get_logger
 
 if TYPE_CHECKING:
-    from autobots_devtools_shared_lib.common.jenkins.config import (
+    from autobots_devtools_shared_lib.common.config.jenkins_config import (
         JenkinsConfig,
         JenkinsPipelineConfig,
     )
@@ -147,7 +147,7 @@ def register_pipeline_tools() -> list[Any]:
     reads from disk on each invocation.
     """
     try:
-        from autobots_devtools_shared_lib.common.jenkins.loader import load_jenkins_config
+        from autobots_devtools_shared_lib.common.config.jenkins_loader import load_jenkins_config
 
         logger.info("Loading Jenkins pipeline tools")
         config = load_jenkins_config()

autobots_devtools_shared_lib-0.2.3a2/src/autobots_devtools_shared_lib/common/jenkins/http_utils.py → autobots_devtools_shared_lib-0.3.2/src/autobots_devtools_shared_lib/common/utils/jenkins_http_utils.py

@@ -12,7 +12,7 @@ import requests
 from autobots_devtools_shared_lib.common.observability.logging_utils import get_logger
 
 if TYPE_CHECKING:
-    from autobots_devtools_shared_lib.common.jenkins.config import (
+    from autobots_devtools_shared_lib.common.config.jenkins_config import (
         JenkinsConfig,
         JenkinsPollingConfig,
     )
@@ -106,8 +106,8 @@ def wait_for_build(
 ) -> str:
     """Poll the build API until the result is non-null or the timeout is reached."""
     elapsed = 0
+    api_url = f"{base_url}/job/{job_name}/{build_number}/api/json"
     while elapsed < polling.max_wait_seconds:
-        api_url = f"{base_url}/job/{job_name}/{build_number}/api/json"
         try:
             resp = requests.get(api_url, auth=auth, timeout=30)
             resp.raise_for_status()
@@ -122,12 +122,19 @@ def wait_for_build(
                 f"Build #{build_number} in progress; "
                 f"waiting {polling.poll_interval_seconds}s (elapsed={elapsed}s)"
             )
-            time.sleep(polling.poll_interval_seconds)
-            elapsed += polling.poll_interval_seconds
+        except (requests.ConnectionError, requests.Timeout) as exc:
+            logger.warning(
+                f"Transient poll error for {job_name}#{build_number}: {exc}; retrying in "
+                f"{polling.poll_interval_seconds}s (elapsed={elapsed}s)"
+            )
+        except requests.HTTPError as exc:
+            logger.exception(f"HTTP error polling {job_name}#{build_number}")
+            return f"Error polling build status: {exc}"
         except requests.RequestException as exc:
-            logger.exception(f"Build poll error for {job_name}#{build_number}")
+            logger.exception(f"Unexpected poll error for {job_name}#{build_number}")
             return f"Error polling build status: {exc}"
-
+        time.sleep(polling.poll_interval_seconds)
+        elapsed += polling.poll_interval_seconds
     return (
         f"Timeout: build #{build_number} for job '{job_name}' "
         f"did not complete within {polling.max_wait_seconds}s"

{autobots_devtools_shared_lib-0.2.3a2 → autobots_devtools_shared_lib-0.3.2}/src/autobots_devtools_shared_lib/dynagent/__init__.py

@@ -5,9 +5,7 @@
 # UI streaming helpers live in dynagent.ui to avoid pulling Chainlit for
 # batch/invoke-only use.
 
-from autobots_devtools_shared_lib.common.jenkins.config import JenkinsConfig, JenkinsPipelineConfig
-from autobots_devtools_shared_lib.common.jenkins.loader import load_jenkins_config
-from autobots_devtools_shared_lib.common.jenkins.tools import create_jenkins_tools
+from autobots_devtools_shared_lib.common.tools.context_tools import make_context_tools
 from autobots_devtools_shared_lib.common.utils.format_utils import output_format_converter
 from autobots_devtools_shared_lib.dynagent.agents.agent_config_utils import get_batch_enabled_agents
 from autobots_devtools_shared_lib.dynagent.agents.agent_meta import AgentMeta
@@ -36,19 +34,16 @@ __all__ = [
     "BatchResult",
     "Dynagent",
     "DynagentSettings",
-    "JenkinsConfig",
-    "JenkinsPipelineConfig",
     "LLMProvider",
     "RecordResult",
     "ainvoke_agent",
     "batch_invoker",
     "create_base_agent",
-    "create_jenkins_tools",
     "get_batch_enabled_agents",
     "get_dynagent_settings",
     "invoke_agent",
     "lm",
-    "load_jenkins_config",
+    "make_context_tools",
     "output_format_converter",
     "register_usecase_tools",
     "set_dynagent_settings",

{autobots_devtools_shared_lib-0.2.3a2 → autobots_devtools_shared_lib-0.3.2}/src/autobots_devtools_shared_lib/dynagent/agents/invocation_utils.py

@@ -37,8 +37,8 @@ def inject_langfuse_handler_into_config(
 
 def invoke_agent(
     agent_name: str,
-    input_state: dict[str, Any],
-    checkpointer: Any = None,
+    input_state: dict[str, Any] | None = None,
+    checkpointer: Any | None = None,
     config: RunnableConfig | None = None,
     enable_tracing: bool = True,
     trace_metadata: TraceMetadata | None = None,
@@ -81,6 +81,9 @@ def invoke_agent(
     valid_agents = get_agent_list()
     if agent_name not in valid_agents:
         raise ValueError(f"Unknown agent: {agent_name}. Valid agents: {', '.join(valid_agents)}")
+
+    if input_state is None:
+        input_state = {}
     # Use provided metadata or create default
     if trace_metadata is None:
         trace_metadata = TraceMetadata.create(
@@ -166,8 +169,8 @@ def invoke_agent(
 
 async def ainvoke_agent(
     agent_name: str,
-    input_state: dict[str, Any],
-    checkpointer: Any = None,
+    input_state: dict[str, Any] | None = None,
+    checkpointer: Any | None = None,
     config: RunnableConfig | None = None,
     enable_tracing: bool = True,
     trace_metadata: TraceMetadata | None = None,
@@ -211,6 +214,8 @@ async def ainvoke_agent(
     valid_agents = get_agent_list()
     if agent_name not in valid_agents:
         raise ValueError(f"Unknown agent: {agent_name}. Valid agents: {', '.join(valid_agents)}")
+    if input_state is None:
+        input_state = {}
     # Use provided metadata or create default
     if trace_metadata is None:
         trace_metadata = TraceMetadata.create(

{autobots_devtools_shared_lib-0.2.3a2 → autobots_devtools_shared_lib-0.3.2}/src/autobots_devtools_shared_lib/dynagent/tools/tool_registry.py

@@ -5,12 +5,7 @@ import threading
 from typing import Any
 
 from autobots_devtools_shared_lib.common.observability.logging_utils import get_logger
-from autobots_devtools_shared_lib.common.tools.context_tools import (
-    clear_context_tool,
-    get_context_tool,
-    set_context_tool,
-    update_context_tool,
-)
+from autobots_devtools_shared_lib.common.tools.context_tools import make_context_tools
 from autobots_devtools_shared_lib.common.tools.format_tools import output_format_converter_tool
 from autobots_devtools_shared_lib.common.tools.fserver_client_tools import (
     create_download_link_tool,
@@ -20,6 +15,7 @@ from autobots_devtools_shared_lib.common.tools.fserver_client_tools import (
     read_file_tool,
     write_file_tool,
 )
+from autobots_devtools_shared_lib.dynagent.models.state import Dynagent
 from autobots_devtools_shared_lib.dynagent.tools.state_tools import get_agent_list, handoff
 
 logger = get_logger(__name__)
@@ -47,10 +43,7 @@ def get_default_tools() -> list[Any]:
         handoff,
         get_agent_list,
         output_format_converter_tool,
-        get_context_tool,
-        set_context_tool,
-        update_context_tool,
-        clear_context_tool,
+        *make_context_tools(Dynagent),
         get_disk_usage_tool,
         read_file_tool,
         move_file_tool,
@@ -74,7 +67,7 @@ def get_jenkins_usecase_tools() -> list[Any]:
     if _jenkins_tools_cache is None:  # 1st check — no lock (fast path)
         with _jenkins_tools_lock:  # acquire lock
             if _jenkins_tools_cache is None:  # 2nd check — inside lock (safe)
-                from autobots_devtools_shared_lib.common.jenkins.tools import (
+                from autobots_devtools_shared_lib.common.tools.jenkins_pipeline_tools import (
                     register_pipeline_tools,
                 )
 
@@ -99,9 +92,15 @@ def get_usecase_tools() -> list[Any]:
 
 
 def get_all_tools() -> list[Any]:
-    """Return default + jenkins pipeline + usecase tools. Pure reader."""
-    logger.info("Getting all tools")
-    return get_default_tools() + get_jenkins_usecase_tools() + get_usecase_tools()
+    """Return default + usecase tools; usecase tools override defaults by name."""
+    seen: dict[str, Any] = {}
+    for t in get_default_tools():
+        seen[t.name] = t
+    for t in get_jenkins_usecase_tools():
+        seen[t.name] = t
+    for t in get_usecase_tools():
+        seen[t.name] = t  # usecase wins on collision
+    return list(seen.values())
 
 
 # --- Test-isolation helpers (private; used only by fixtures) ---

autobots_devtools_shared_lib-0.2.3a2/src/autobots_devtools_shared_lib/common/jenkins/__init__.py

@@ -1,26 +0,0 @@
-# ABOUTME: Jenkins pipeline trigger package — config, loader, and tool generation.
-# ABOUTME: Part of the common layer; usable by any dynagent-based application.
-
-from autobots_devtools_shared_lib.common.jenkins.config import (
-    JenkinsAuthConfig,
-    JenkinsConfig,
-    JenkinsParameterConfig,
-    JenkinsPipelineConfig,
-    JenkinsPollingConfig,
-)
-from autobots_devtools_shared_lib.common.jenkins.loader import load_jenkins_config
-from autobots_devtools_shared_lib.common.jenkins.tools import (
-    create_jenkins_tools,
-    register_pipeline_tools,
-)
-
-__all__ = [
-    "JenkinsAuthConfig",
-    "JenkinsConfig",
-    "JenkinsParameterConfig",
-    "JenkinsPipelineConfig",
-    "JenkinsPollingConfig",
-    "create_jenkins_tools",
-    "load_jenkins_config",
-    "register_pipeline_tools",
-]

autobots_devtools_shared_lib-0.2.3a2/src/autobots_devtools_shared_lib/common/tools/context_tools.py

@@ -1,47 +0,0 @@
-from typing import Any
-
-from langchain.tools import ToolRuntime, tool
-
-from autobots_devtools_shared_lib.common.utils.context_utils import (
-    clear_context,
-    get_context,
-    resolve_context_key,
-    set_context,
-    update_context,
-)
-from autobots_devtools_shared_lib.dynagent.models.state import Dynagent
-
-
-@tool
-def get_context_tool(runtime: ToolRuntime[None, Dynagent]) -> dict[str, Any]:
-    """Return the current session context as a JSON-serializable dict.
-
-    The context is loaded from the configured ContextStore backend using the
-    context_key found in the agent state. If no context exists yet, an empty
-    dict is returned.
-    """
-    context_key = resolve_context_key(runtime.state)
-    return get_context(context_key)
-
-
-@tool
-def set_context_tool(runtime: ToolRuntime[None, Dynagent], data: dict[str, Any]) -> str:
-    """Replace the current session context with the provided data."""
-    context_key = resolve_context_key(runtime.state)
-    return set_context(context_key, data)
-
-
-@tool
-def update_context_tool(
-    runtime: ToolRuntime[None, Dynagent], patch: dict[str, Any]
-) -> dict[str, Any]:
-    """Apply a partial update to the session context and return the new context."""
-    context_key = resolve_context_key(runtime.state)
-    return update_context(context_key, patch)
-
-
-@tool
-def clear_context_tool(runtime: ToolRuntime[None, Dynagent]) -> str:
-    """Clear any stored context for the current session."""
-    context_key = resolve_context_key(runtime.state)
-    return clear_context(context_key)