fix merges from main

Author: jgbradley1

graphrag/api/query.py

@@ -19,7 +19,7 @@
 
 from collections.abc import AsyncGenerator
 from pathlib import Path
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import pandas as pd
 from pydantic import validate_call
@@ -44,12 +44,14 @@
     read_indexer_reports,
     read_indexer_text_units,
 )
-from graphrag.query.structured_search.base import SearchResult  # noqa: TC001
 from graphrag.utils.cli import redact
 from graphrag.utils.embeddings import create_collection_name
 from graphrag.vector_stores.base import BaseVectorStore
 from graphrag.vector_stores.factory import VectorStoreFactory, VectorStoreType
 
+if TYPE_CHECKING:
+    from graphrag.query.structured_search.base import SearchResult
+
 reporter = PrintProgressReporter("")
 
 

graphrag/index/config/cache.py

@@ -52,22 +52,18 @@ class PipelineBlobCacheConfig(PipelineCacheConfig[Literal[CacheType.blob]]):
     type: Literal[CacheType.blob] = CacheType.blob
     """The type of cache."""
 
-    base_dir: str = pydantic_Field(
-        description="The base directory for the cache.", default=""
-    )
+    base_dir: str = Field(description="The base directory for the cache.", default="")
     """The base directory for the cache."""
 
     connection_string: str | None = Field(
         description="The blob cache connection string for the cache.", default=None
     )
     """The blob cache connection string for the cache."""
 
-    container_name: str = pydantic_Field(
-        description="The container name for cache", default=""
-    )
+    container_name: str = Field(description="The container name for cache", default="")
     """The container name for cache"""
 
-    storage_account_blob_url: str = pydantic_Field(
+    storage_account_blob_url: str = Field(
         description="The storage account blob url for cache", default=""
     )
     """The storage account blob url for cache"""
@@ -79,22 +75,20 @@ class PipelineCosmosDBCacheConfig(PipelineCacheConfig[Literal[CacheType.cosmosdb
     type: Literal[CacheType.cosmosdb] = CacheType.cosmosdb
     """The type of cache."""
 
-    base_dir: str = pydantic_Field(
+    base_dir: str = Field(
         description="The cosmosdb database name for the cache.", default=""
     )
     """The cosmosdb database name for the cache."""
 
-    container_name: str = pydantic_Field(
-        description="The container name for cache.", default=""
-    )
+    container_name: str = Field(description="The container name for cache.", default="")
     """The container name for cache."""
 
-    connection_string: str | None = pydantic_Field(
+    connection_string: str | None = Field(
         description="The cosmosdb primary key for the cache.", default=None
     )
     """The cosmosdb primary key for the cache."""
 
-    cosmosdb_account_url: str = pydantic_Field(
+    cosmosdb_account_url: str = Field(
         description="The cosmosdb account url for cache", default=""
     )
     """The cosmosdb account url for cache"""

graphrag/index/config/reporting.py

@@ -53,17 +53,17 @@ class PipelineBlobReportingConfig(PipelineReportingConfig[Literal[ReportingType.
     )
     """The blob reporting connection string for the reporting."""
 
-    container_name: str = pydantic_Field(
+    container_name: str = Field(
         description="The container name for reporting", default=""
     )
     """The container name for reporting"""
 
-    storage_account_blob_url: str = pydantic_Field(
+    storage_account_blob_url: str = Field(
         description="The storage account blob url for reporting", default=""
     )
     """The storage account blob url for reporting"""
 
-    base_dir: str = pydantic_Field(
+    base_dir: str = Field(
         description="The base directory for the reporting.", default=""
     )
     """The base directory for the reporting."""

graphrag/index/config/storage.py

@@ -50,17 +50,15 @@ class PipelineBlobStorageConfig(PipelineStorageConfig[Literal[StorageType.blob]]
     )
     """The blob storage connection string for the storage."""
 
-    container_name: str = pydantic_Field(
+    container_name: str = Field(
         description="The container name for storage", default=""
     )
     """The container name for storage."""
 
-    base_dir: str = pydantic_Field(
-        description="The base directory for the storage.", default=""
-    )
+    base_dir: str = Field(description="The base directory for the storage.", default="")
     """The base directory for the storage."""
 
-    storage_account_blob_url: str = pydantic_Field(
+    storage_account_blob_url: str = Field(
         description="The storage account blob url.", default=""
     )
     """The storage account blob url."""
@@ -74,22 +72,20 @@ class PipelineCosmosDBStorageConfig(
     type: Literal[StorageType.cosmosdb] = StorageType.cosmosdb
     """The type of storage."""
 
-    connection_string: str | None = pydantic_Field(
+    connection_string: str | None = Field(
         description="The cosmosdb storage primary key for the storage.", default=None
     )
     """The cosmosdb storage primary key for the storage."""
 
-    container_name: str = pydantic_Field(
+    container_name: str = Field(
         description="The container name for storage", default=""
     )
     """The container name for storage."""
 
-    base_dir: str = pydantic_Field(
-        description="The base directory for the storage.", default=""
-    )
+    base_dir: str = Field(description="The base directory for the storage.", default="")
     """The base directory for the storage."""
 
-    cosmosdb_account_url: str = pydantic_Field(
+    cosmosdb_account_url: str = Field(
         description="The cosmosdb account url.", default=""
     )
     """The cosmosdb account url."""

poetry.lock

@@ -81,10 +81,9 @@ devtools = "^0.12.2"
 typing-extensions = "^4.12.2"
 
 #Azure
-azure-storage-blob = "^12.24.0"
-azure-identity = "^1.19.0"
 azure-cosmos = "^4.9.0"
-json-repair = "^0.30.0"
+azure-identity = "^1.19.0"
+azure-storage-blob = "^12.24.0"
 
 future = "^1.0.0" # Needed until graspologic fixes their dependency
 typer = "^0.15.1"
@@ -273,4 +272,4 @@ exclude = ["**/node_modules", "**/__pycache__"]
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
 timeout = 1000
-env_files = [".env"]
+env_files = [".env"]