Merge pull request #18 from lastmile-ai/pr18

Updates to Dependencies and Dependency Management

pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 
 [project]
 name = "tracing_auto_instrumentation"
-version = "0.0.3"
+version = "0.0.4"
 authors = [
   { name="LastMile AI" },
 ]
@@ -14,11 +14,18 @@ classifiers = [
   "Intended Audience :: Developers",
   "Programming Language :: Python :: 3",
 ]
-dynamic = ["dependencies"]
+dynamic = ["dependencies", "optional-dependencies"]
 
 [tool.setuptools.dynamic]
 dependencies = {file = ["requirements.txt"]}
 
+[tool.setuptools.dynamic.optional-dependencies]
+ibm = {file = ["requirements-ibm.txt"]}
+langchain = {file = ["requirements-langchain.txt"]}
+llama-index = {file = ["requirements-llama-index.txt"]}
+openai = {file = ["requirements-openai.txt"]}
+
+
 [project.urls]
 "Homepage" = "https://github.com/lastmile-ai/tracing_auto_instrumentation"
 "Bug Tracker" = "https://github.com/lastmile-ai/tracing_auto_instrumentation/issues"

requirements-ibm.txt

@@ -0,0 +1 @@
+ibm-watsonx-ai

requirements-langchain.txt

@@ -0,0 +1,4 @@
+langchain
+langchain_core
+langchain_openai
+openinference-instrumentation-langchain

requirements-llama-index.txt

@@ -0,0 +1,5 @@
+llama-index
+llama-index-embeddings-openai
+llama-index-readers-web
+llama-index-callbacks-openinference
+openinference-instrumentation-llama-index

requirements-openai.txt

@@ -0,0 +1 @@
+openai

requirements.txt

@@ -1,21 +1,6 @@
+# Common dependencies
 lastmile_eval
-
-ibm-watsonx-ai
-openai
-
-# Integrations with other LLM frameworks
-llama-index
-llama-index-embeddings-openai
-llama-index-readers-web
-llama-index-callbacks-openinference
-openai
-html2text 
-pandas 
-pyarrow 
+html2text
+pandas
+pyarrow
 tqdm
-openinference-instrumentation-llama-index
-openinference-instrumentation-langchain
-langchain
-langchain_core
-langchain_openai
-ibm_watsonx_ai

src/tracing_auto_instrumentation/__init__.py

@@ -1,14 +0,0 @@
-from .llama_index_callback_handler import (
-    LlamaIndexCallbackHandler,
-)
-
-from .langchain_instrumentor import LangChainInstrumentor
-from .ibm import wrap_watson
-from .openai import wrap_openai
-
-__ALL__ = [
-    LlamaIndexCallbackHandler.__name__,
-    LangChainInstrumentor.__name__,
-    wrap_watson.__name__,
-    wrap_openai.__name__,
-]

src/tracing_auto_instrumentation/ibm/__init__.py

@@ -0,0 +1,6 @@
+
+from .ibm import wrap_watson
+
+__ALL__ = [
+    wrap_watson.__name__,
+]

src/tracing_auto_instrumentation/ibm.py → src/tracing_auto_instrumentation/ibm/ibm.py

@@ -19,7 +19,7 @@
 )
 
 
-from .wrap_utils import (
+from ..wrap_utils import (
     NamedWrapper,
 )
 

src/tracing_auto_instrumentation/langchain/__init__.py

@@ -0,0 +1,5 @@
+from .langchain_instrumentor import LangChainInstrumentor
+
+__ALL__ = [
+    LangChainInstrumentor.__name__,
+]

src/tracing_auto_instrumentation/llama_index/__init__.py

@@ -0,0 +1,8 @@
+from .llama_index_callback_handler import (
+    LlamaIndexCallbackHandler,
+)
+
+
+__ALL__ = [
+    LlamaIndexCallbackHandler.__name__,
+]

src/tracing_auto_instrumentation/openai/__init__.py

@@ -0,0 +1,5 @@
+from .openai import wrap_openai
+
+__ALL__ = [
+    wrap_openai.__name__,
+]