Llmtracker fix

agentops/__init__.py

@@ -11,6 +11,7 @@
 import threading
 from importlib.metadata import version as get_version
 from packaging import version
+from .llms import tracker
 
 try:
     from .partners.langchain_callback_handler import (

agentops/client.py

@@ -23,7 +23,7 @@
 from .config import Configuration
 from .event import ErrorEvent, Event
 from .host_env import get_host_env
-from .llms import LlmTracker
+from .llms.tracker import LlmTracker
 from .log_config import logger
 from .meta_client import MetaClient
 from .session import Session, active_sessions

agentops/llms/ai21.py → agentops/llms/providers/ai21.py

@@ -2,14 +2,14 @@
 import pprint
 from typing import Optional
 
-from agentops.llms.instrumented_provider import InstrumentedProvider
-from agentops.time_travel import fetch_completion_override_from_time_travel_cache
-
-from ..event import ErrorEvent, LLMEvent, ActionEvent, ToolEvent
-from ..session import Session
-from ..log_config import logger
-from ..helpers import check_call_stack_for_agent_id, get_ISO_time
-from ..singleton import singleton
+from ...llms.providers.instrumented_provider import InstrumentedProvider
+from ...time_travel import fetch_completion_override_from_time_travel_cache
+
+from ...event import ErrorEvent, LLMEvent, ActionEvent, ToolEvent
+from ...session import Session
+from ...log_config import logger
+from ...helpers import check_call_stack_for_agent_id, get_ISO_time
+from ...singleton import singleton
 
 
 @singleton

agentops/llms/anthropic.py → agentops/llms/providers/anthropic.py

@@ -2,14 +2,14 @@
 import pprint
 from typing import Optional
 
-from agentops.llms.instrumented_provider import InstrumentedProvider
-from agentops.time_travel import fetch_completion_override_from_time_travel_cache
-
-from ..event import ErrorEvent, LLMEvent, ToolEvent
-from ..helpers import check_call_stack_for_agent_id, get_ISO_time
-from ..log_config import logger
-from ..session import Session
-from ..singleton import singleton
+from ...llms.providers.instrumented_provider import InstrumentedProvider
+from ...time_travel import fetch_completion_override_from_time_travel_cache
+
+from ...event import ErrorEvent, LLMEvent, ToolEvent
+from ...helpers import check_call_stack_for_agent_id, get_ISO_time
+from ...log_config import logger
+from ...session import Session
+from ...singleton import singleton
 
 
 @singleton

agentops/llms/cohere.py → agentops/llms/providers/cohere.py

@@ -3,11 +3,11 @@
 from typing import Optional
 
 from .instrumented_provider import InstrumentedProvider
-from ..event import ActionEvent, ErrorEvent, LLMEvent
-from ..session import Session
-from ..log_config import logger
-from agentops.helpers import get_ISO_time, check_call_stack_for_agent_id
-from ..singleton import singleton
+from ...event import ActionEvent, ErrorEvent, LLMEvent
+from ...session import Session
+from ...log_config import logger
+from ...helpers import get_ISO_time, check_call_stack_for_agent_id
+from ...singleton import singleton
 
 
 @singleton

agentops/llms/groq.py → agentops/llms/providers/groq.py

@@ -2,11 +2,11 @@
 from typing import Optional
 
 from .instrumented_provider import InstrumentedProvider
-from ..event import ErrorEvent, LLMEvent
-from ..session import Session
-from ..log_config import logger
-from agentops.helpers import get_ISO_time, check_call_stack_for_agent_id
-from ..singleton import singleton
+from ...event import ErrorEvent, LLMEvent
+from ...session import Session
+from ...log_config import logger
+from ...helpers import get_ISO_time, check_call_stack_for_agent_id
+from ...singleton import singleton
 
 
 @singleton

agentops/llms/instrumented_provider.py → agentops/llms/providers/instrumented_provider.py

@@ -1,8 +1,8 @@
 from abc import ABC, abstractmethod
 from typing import Optional
 
-from ..session import Session
-from ..event import LLMEvent
+from ...session import Session
+from ...event import LLMEvent
 
 
 class InstrumentedProvider(ABC):

agentops/llms/litellm.py → agentops/llms/providers/litellm.py

@@ -1,13 +1,13 @@
 import pprint
 from typing import Optional
 
-from ..log_config import logger
-from ..event import LLMEvent, ErrorEvent
-from ..session import Session
-from agentops.helpers import get_ISO_time, check_call_stack_for_agent_id
-from agentops.llms.instrumented_provider import InstrumentedProvider
-from agentops.time_travel import fetch_completion_override_from_time_travel_cache
-from ..singleton import singleton
+from ...log_config import logger
+from ...event import LLMEvent, ErrorEvent
+from ...session import Session
+from ...helpers import get_ISO_time, check_call_stack_for_agent_id
+from ...llms.providers.instrumented_provider import InstrumentedProvider
+from ...time_travel import fetch_completion_override_from_time_travel_cache
+from ...singleton import singleton
 
 
 @singleton

agentops/llms/mistral.py → agentops/llms/providers/mistral.py

@@ -3,10 +3,10 @@
 import sys
 from typing import Optional
 
-from ..event import LLMEvent, ErrorEvent
-from ..session import Session
-from ..log_config import logger
-from agentops.helpers import get_ISO_time, check_call_stack_for_agent_id
+from ...event import LLMEvent, ErrorEvent
+from ...session import Session
+from ...log_config import logger
+from ...helpers import get_ISO_time, check_call_stack_for_agent_id
 from .instrumented_provider import InstrumentedProvider
 
 

agentops/llms/ollama.py → agentops/llms/providers/ollama.py

@@ -2,11 +2,11 @@
 import sys
 from typing import Optional
 
-from ..event import LLMEvent
-from ..session import Session
-from agentops.helpers import get_ISO_time, check_call_stack_for_agent_id
+from ...event import LLMEvent
+from ...session import Session
+from ...helpers import get_ISO_time, check_call_stack_for_agent_id
 from .instrumented_provider import InstrumentedProvider
-from ..singleton import singleton
+from ...singleton import singleton
 
 original_func = {}
 

agentops/llms/openai.py → agentops/llms/providers/openai.py

@@ -2,14 +2,14 @@
 import pprint
 from typing import Optional
 
-from agentops.llms.instrumented_provider import InstrumentedProvider
-from agentops.time_travel import fetch_completion_override_from_time_travel_cache
-
-from ..event import ActionEvent, ErrorEvent, LLMEvent
-from ..session import Session
-from ..log_config import logger
-from ..helpers import check_call_stack_for_agent_id, get_ISO_time
-from ..singleton import singleton
+from ...llms.providers.instrumented_provider import InstrumentedProvider
+from ...time_travel import fetch_completion_override_from_time_travel_cache
+
+from ...event import ActionEvent, ErrorEvent, LLMEvent
+from ...session import Session
+from ...log_config import logger
+from ...helpers import check_call_stack_for_agent_id, get_ISO_time
+from ...singleton import singleton
 
 
 @singleton

agentops/llms/__init__.py → agentops/llms/tracker.py

@@ -1,4 +1,3 @@
-import functools
 import sys
 from importlib import import_module
 from importlib.metadata import version
@@ -7,14 +6,14 @@
 
 from ..log_config import logger
 
-from .cohere import CohereProvider
-from .groq import GroqProvider
-from .litellm import LiteLLMProvider
-from .ollama import OllamaProvider
-from .openai import OpenAiProvider
-from .anthropic import AnthropicProvider
-from .mistral import MistralProvider
-from .ai21 import AI21Provider
+from .providers.cohere import CohereProvider
+from .providers.groq import GroqProvider
+from .providers.litellm import LiteLLMProvider
+from .providers.ollama import OllamaProvider
+from .providers.openai import OpenAiProvider
+from .providers.anthropic import AnthropicProvider
+from .providers.mistral import MistralProvider
+from .providers.ai21 import AI21Provider
 
 original_func = {}
 original_create = None

agentops/partners/autogen_logger.py

@@ -12,7 +12,7 @@
 from autogen.logger.base_logger import BaseLogger, LLMConfig
 
 from agentops.enums import EndState
-from agentops.helpers import get_ISO_time
+from ..helpers import get_ISO_time
 
 from agentops import LLMEvent, ToolEvent, ActionEvent
 from uuid import uuid4

agentops/partners/langchain_callback_handler.py

@@ -1,23 +1,23 @@
 from typing import Dict, Any, List, Optional, Sequence, Union
 from collections import defaultdict
 from uuid import UUID
+import logging
+import os
+
+from tenacity import RetryCallState
 
 from langchain_core.agents import AgentFinish, AgentAction
 from langchain_core.documents import Document
 from langchain_core.outputs import ChatGenerationChunk, GenerationChunk, LLMResult
 from langchain.callbacks.base import BaseCallbackHandler, AsyncCallbackHandler
 from langchain_core.messages import BaseMessage
 
-from tenacity import RetryCallState
 
 from agentops import Client as AOClient
 from agentops import ActionEvent, LLMEvent, ToolEvent, ErrorEvent
-from agentops.helpers import get_ISO_time
+from ..helpers import get_ISO_time, debug_print_function_params
 
-from ..helpers import debug_print_function_params
-import os
 from ..log_config import logger
-import logging
 
 
 def get_model_from_kwargs(kwargs: any) -> str:

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "agentops"
-version = "0.3.19"
+version = "0.3.20rc8"
 authors = [
   { name="Alex Reibman", email="[email protected]" },
   { name="Shawn Qiu", email="[email protected]" },
@@ -34,22 +34,6 @@ dependencies = [
 langchain = [
     "langchain==0.2.14; python_version >= '3.8.1'"
 ]
-
-
-[dependency-groups]
-dev = [
-    "pytest==7.4.0",
-    "pytest-depends",
-    "pytest-asyncio",
-    "pytest-vcr",
-    "pytest-mock",
-    "pyfakefs",
-    "requests_mock==1.11.0",
-    "ruff",
-    "vcrpy>=6.0.0; python_version >= '3.8'"
-]
-
-
 ci = [
     "tach~=0.9",
 ]
@@ -122,4 +106,4 @@ exclude = [
 ]
 
 [tool.setuptools]
-packages = ["agentops"]
+packages = ["agentops", "agentops.llms", "agentops.llms.providers"]