Cleanup

Author: Dwij1704

agentops/instrumentation/__init__.py

@@ -47,28 +47,28 @@ class InstrumentorConfig(TypedDict):
 # Configuration for supported LLM providers
 PROVIDERS: dict[str, InstrumentorConfig] = {
     "openai": {
-        "module_name": "agentops.instrumentation.openai",
+        "module_name": "agentops.instrumentation.providers.openai",
         "class_name": "OpenAIInstrumentor",
         "min_version": "1.0.0",
     },
     "anthropic": {
-        "module_name": "agentops.instrumentation.anthropic",
+        "module_name": "agentops.instrumentation.providers.anthropic",
         "class_name": "AnthropicInstrumentor",
         "min_version": "0.32.0",
     },
     "ibm_watsonx_ai": {
-        "module_name": "agentops.instrumentation.ibm_watsonx_ai",
+        "module_name": "agentops.instrumentation.providers.ibm_watsonx_ai",
         "class_name": "IBMWatsonXInstrumentor",
         "min_version": "0.1.0",
     },
     "google.genai": {
-        "module_name": "agentops.instrumentation.google_genai",
+        "module_name": "agentops.instrumentation.providers.google_genai",
         "class_name": "GoogleGenAIInstrumentor",
         "min_version": "0.1.0",
         "package_name": "google-genai",  # Actual pip package name
     },
     "mem0": {
-        "module_name": "agentops.instrumentation.mem0",
+        "module_name": "agentops.instrumentation.providers.mem0",
         "class_name": "Mem0Instrumentor",
         "min_version": "0.1.0",
         "package_name": "mem0ai",
@@ -78,7 +78,7 @@ class InstrumentorConfig(TypedDict):
 # Configuration for utility instrumentors
 UTILITY_INSTRUMENTORS: dict[str, InstrumentorConfig] = {
     "concurrent.futures": {
-        "module_name": "agentops.instrumentation.concurrent_futures",
+        "module_name": "agentops.instrumentation.utilities.concurrent_futures",
         "class_name": "ConcurrentFuturesInstrumentor",
         "min_version": "3.7.0",  # Python 3.7+ (concurrent.futures is stdlib)
         "package_name": "python",  # Special case for stdlib modules
@@ -88,21 +88,35 @@ class InstrumentorConfig(TypedDict):
 # Configuration for supported agentic libraries
 AGENTIC_LIBRARIES: dict[str, InstrumentorConfig] = {
     "crewai": {
-        "module_name": "agentops.instrumentation.crewai",
+        "module_name": "agentops.instrumentation.agentic.crewai",
         "class_name": "CrewAIInstrumentor",
         "min_version": "0.56.0",
     },
-    "autogen": {"module_name": "agentops.instrumentation.ag2", "class_name": "AG2Instrumentor", "min_version": "0.3.2"},
+    "autogen": {
+        "module_name": "agentops.instrumentation.agentic.ag2",
+        "class_name": "AG2Instrumentor",
+        "min_version": "0.3.2",
+    },
     "agents": {
-        "module_name": "agentops.instrumentation.openai_agents",
+        "module_name": "agentops.instrumentation.agentic.openai_agents",
         "class_name": "OpenAIAgentsInstrumentor",
         "min_version": "0.0.1",
     },
     "google.adk": {
-        "module_name": "agentops.instrumentation.google_adk",
+        "module_name": "agentops.instrumentation.agentic.google_adk",
         "class_name": "GoogleADKInstrumentor",
         "min_version": "0.1.0",
     },
+    "agno": {
+        "module_name": "agentops.instrumentation.agentic.agno",
+        "class_name": "AgnoInstrumentor",
+        "min_version": "0.1.0",
+    },
+    "smolagents": {
+        "module_name": "agentops.instrumentation.agentic.smolagents",
+        "class_name": "SmolAgentsInstrumentor",
+        "min_version": "1.0.0",
+    },
 }
 
 # Combine all target packages for monitoring

agentops/instrumentation/ag2/__init__.py …/instrumentation/agentic/ag2/__init__.pyagentops/instrumentation/ag2/__init__.py renamed to agentops/instrumentation/agentic/ag2/__init__.py agentops/instrumentation/ag2/__init__.py renamed to agentops/instrumentation/agentic/ag2/__init__.py

@@ -13,6 +13,6 @@
 LIBRARY_VERSION = _library_info.version
 
 # Import after defining constants to avoid circular imports
-from agentops.instrumentation.ag2.instrumentor import AG2Instrumentor  # noqa: E402
+from agentops.instrumentation.agentic.ag2.instrumentor import AG2Instrumentor  # noqa: E402
 
 __all__ = ["AG2Instrumentor", "LIBRARY_NAME", "LIBRARY_VERSION"]

…tops/instrumentation/ag2/instrumentor.py …trumentation/agentic/ag2/instrumentor.pyagentops/instrumentation/ag2/instrumentor.py renamed to agentops/instrumentation/agentic/ag2/instrumentor.py agentops/instrumentation/ag2/instrumentor.py renamed to agentops/instrumentation/agentic/ag2/instrumentor.py

@@ -20,7 +20,7 @@
     create_span,
     SpanAttributeManager,
 )
-from agentops.instrumentation.ag2 import LIBRARY_NAME, LIBRARY_VERSION
+from agentops.instrumentation.agentic.ag2 import LIBRARY_NAME, LIBRARY_VERSION
 from agentops.semconv.message import MessageAttributes
 from agentops.semconv.span_attributes import SpanAttributes
 from agentops.semconv.agent import AgentAttributes