Merge pull request #481 from Scale3-Labs/obinna/S3EN-1111-update-pinecone-integration

update pinecone integration and fix failing test

Author: obinnascale3

pyproject.toml

@@ -46,7 +46,7 @@ dev = [
   "qdrant-client",
   "graphlit-client",
   "python-dotenv",
-  "pinecone-client",
+  "pinecone",
   "langchain",
   "langchain-community",
   "langchain-openai",

src/langtrace_python_sdk/instrumentation/langchain_core/patch.py

@@ -248,8 +248,9 @@ def clean_empty(d):
         elif isinstance(val, object):
             # some langchain objects have a text attribute
             val = getattr(val, "text", None)
-            if val is not None and val.strip() != "":
-                result[k] = val.strip()
+            if val is not None and isinstance(val, str):
+                if val.strip() != "":
+                    result[k] = val.strip()
     return result
 
 

src/langtrace_python_sdk/instrumentation/pinecone/instrumentation.py

@@ -33,12 +33,12 @@ class PineconeInstrumentation(BaseInstrumentor):
     The PineconeInstrumentation class represents the Pinecone instrumentation"""
 
     def instrumentation_dependencies(self) -> Collection[str]:
-        return ["pinecone-client >= 3.1.0"]
+        return ["pinecone >= 3.1.0"]
 
     def _instrument(self, **kwargs):
         tracer_provider = kwargs.get("tracer_provider")
         tracer = get_tracer(__name__, "", tracer_provider)
-        version = importlib.metadata.version("pinecone-client")
+        version = importlib.metadata.version("pinecone")
         for operation_name, details in APIS.items():
             operation = details["OPERATION"]
             # Dynamically creating the patching call

src/langtrace_python_sdk/instrumentation/pinecone/patch.py

@@ -64,7 +64,7 @@ def traced_method(wrapped, instance, args, kwargs):
         ) as span:
 
             if span.is_recording():
-                set_span_attribute(span, "server.address", instance._config.host)
+                set_span_attribute(span, "server.address", instance.config.host)
                 if operation_name == "QUERY":
                     set_query_input_attributes(span, kwargs)
 

src/langtrace_python_sdk/langtrace.py

@@ -301,7 +301,7 @@ def init(
     all_instrumentations = {
         "openai": OpenAIInstrumentation(),
         "groq": GroqInstrumentation(),
-        "pinecone-client": PineconeInstrumentation(),
+        "pinecone": PineconeInstrumentation(),
         "llama-index": LlamaindexInstrumentation(),
         "chromadb": ChromaInstrumentation(),
         "embedchain": EmbedchainInstrumentation(),

src/langtrace_python_sdk/types/__init__.py

@@ -25,7 +25,7 @@ class InstrumentationType(Enum):
     MISTRALAI = "mistralai"
     OLLAMA = "ollama"
     OPENAI = "openai"
-    PINECONE = "pinecone-client"
+    PINECONE = "pinecone"
     QDRANT = "qdrant"
     SQLALCHEMY = "sqlalchemy"
     VERTEXAI = "vertexai"

src/langtrace_python_sdk/version.py

@@ -1 +1 @@
-__version__ = "3.6.2"
+__version__ = "3.6.3"

src/tests/pinecone/test_pinecone.py

@@ -34,7 +34,7 @@ def test_upsert(openai_client, pinecone_client, exporter):
     assert attributes.get("langtrace.sdk.name") == "langtrace-python-sdk"
     assert attributes.get("langtrace.service.name") == SERVICE_PROVIDERS["PINECONE"]
     assert attributes.get("langtrace.service.type") == "vectordb"
-    assert attributes.get("langtrace.service.version") == v("pinecone-client")
+    assert attributes.get("langtrace.service.version") == v("pinecone")
     assert attributes.get("langtrace.version") == v("langtrace-python-sdk")
     assert attributes.get("db.system") == "pinecone"
     assert attributes.get("db.operation") == APIS["UPSERT"]["OPERATION"]
@@ -67,7 +67,7 @@ def test_query(openai_client, pinecone_client, exporter):
     assert attributes.get("langtrace.sdk.name") == "langtrace-python-sdk"
     assert attributes.get("langtrace.service.name") == SERVICE_PROVIDERS["PINECONE"]
     assert attributes.get("langtrace.service.type") == "vectordb"
-    assert attributes.get("langtrace.service.version") == v("pinecone-client")
+    assert attributes.get("langtrace.service.version") == v("pinecone")
     assert attributes.get("langtrace.version") == v("langtrace-python-sdk")
     assert attributes.get("db.system") == "pinecone"
     assert attributes.get("db.operation") == APIS["QUERY"]["OPERATION"]