Merge branch 'main' into amazon_bedrock_converse

deepset-ai · Nov 27, 2024 · f309b60 · f309b60
2 parents 4637c5d + 15dacfa
commit f309b60
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/integrations/jina/CHANGELOG.md b/integrations/jina/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## [integrations/jina-v0.5.1] - 2024-11-26
+
+### 🧹 Chores
+
+- Fix linting/isort (#1215)
+
+### 🌀 Miscellaneous
+
+- Fix: `JinaReaderConnector` - fix the name of the output edge (#1217)
+
 ## [integrations/jina-v0.5.0] - 2024-11-21
 
 ### 🚀 Features

diff --git a/integrations/jina/src/haystack_integrations/components/connectors/jina/reader.py b/integrations/jina/src/haystack_integrations/components/connectors/jina/reader.py
@@ -103,7 +103,7 @@ def _json_to_document(self, data: dict) -> Document:
         document = Document(content=content, meta=data)
         return document
 
-    @component.output_types(document=List[Document])
+    @component.output_types(documents=List[Document])
     def run(self, query: str, headers: Optional[Dict[str, str]] = None):
         """
         Process the query/URL using the Jina AI reader service.

diff --git a/integrations/langfuse/src/haystack_integrations/tracing/langfuse/tracer.py b/integrations/langfuse/src/haystack_integrations/tracing/langfuse/tracer.py
@@ -42,7 +42,7 @@
 
 # Context var used to keep track of tracing related info.
 # This mainly useful for parents spans.
-tracing_context_var: ContextVar[Dict[Any, Any]] = ContextVar("tracing_context", default={})
+tracing_context_var: ContextVar[Dict[Any, Any]] = ContextVar("tracing_context")
 
 
 class LangfuseSpan(Span):
@@ -147,15 +147,16 @@ def trace(
                     operation_name=operation_name,
                 )
             # Create a new trace if no parent span is provided
+            context = tracing_context_var.get({})
             span = LangfuseSpan(
                 self._tracer.trace(
                     name=self._name,
                     public=self._public,
-                    id=tracing_context_var.get().get("trace_id"),
-                    user_id=tracing_context_var.get().get("user_id"),
-                    session_id=tracing_context_var.get().get("session_id"),
-                    tags=tracing_context_var.get().get("tags"),
-                    version=tracing_context_var.get().get("version"),
+                    id=context.get("trace_id"),
+                    user_id=context.get("user_id"),
+                    session_id=context.get("session_id"),
+                    tags=context.get("tags"),
+                    version=context.get("version"),
                 )
             )
         elif tags.get(_COMPONENT_TYPE_KEY) in _ALL_SUPPORTED_GENERATORS: