From 45f7933ffc800b278c7f0046a2a373501d5d92c1 Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Sat, 11 Jan 2025 19:27:23 +0200 Subject: [PATCH 1/6] add ruff lint --- .github/workflows/test.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 68f1c5a..5aa5cad 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,6 +33,13 @@ jobs: with: python-version: 3.x # Update with desired Python version + - uses: astral-sh/ruff-action@v3 + with: + src: >- + "./graphrag_sdk" + "./examples" + "./tests" + - name: Cache Poetry virtualenv id: cache uses: actions/cache@v4 From b510f38b22b6169928e90e5e19c789dc1aa8bdad Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Sat, 11 Jan 2025 20:00:33 +0200 Subject: [PATCH 2/6] fix lint errors --- .github/workflows/test.yml | 2 - graphrag_sdk/agents/agent.py | 2 - graphrag_sdk/agents/kg_agent.py | 2 - graphrag_sdk/attribute.py | 1 - graphrag_sdk/document_loaders/pdf.py | 6 +- graphrag_sdk/helpers.py | 10 +- graphrag_sdk/models/litellm.py | 2 +- graphrag_sdk/orchestrator/__init__.py | 1 - graphrag_sdk/orchestrator/execution_plan.py | 2 +- graphrag_sdk/orchestrator/orchestrator.py | 1 - graphrag_sdk/orchestrator/steps/parallel.py | 9 +- graphrag_sdk/orchestrator/steps/summary.py | 1 - graphrag_sdk/source.py | 2 +- graphrag_sdk/steps/create_ontology_step.py | 7 +- graphrag_sdk/steps/extract_data_step.py | 5 +- poetry.lock | 897 ++++++++++---------- 16 files changed, 464 insertions(+), 486 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5aa5cad..d83d860 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,8 +37,6 @@ jobs: with: src: >- "./graphrag_sdk" - "./examples" - "./tests" - name: Cache Poetry virtualenv id: cache diff --git a/graphrag_sdk/agents/agent.py b/graphrag_sdk/agents/agent.py index 54c95fa..d896c08 100644 --- a/graphrag_sdk/agents/agent.py +++ b/graphrag_sdk/agents/agent.py @@ -1,6 +1,4 @@ from abc import ABC, abstractmethod -from graphrag_sdk.models.model import GenerativeModelChatSession - class AgentResponseCode: """ diff --git a/graphrag_sdk/agents/kg_agent.py b/graphrag_sdk/agents/kg_agent.py index 908303a..33a73dd 100644 --- a/graphrag_sdk/agents/kg_agent.py +++ b/graphrag_sdk/agents/kg_agent.py @@ -1,7 +1,5 @@ from graphrag_sdk.kg import KnowledgeGraph from .agent import Agent -from graphrag_sdk.models import GenerativeModelChatSession - class KGAgent(Agent): """Represents an Agent for a FalkorDB Knowledge Graph. diff --git a/graphrag_sdk/attribute.py b/graphrag_sdk/attribute.py index 9c4e4ba..373c563 100644 --- a/graphrag_sdk/attribute.py +++ b/graphrag_sdk/attribute.py @@ -1,5 +1,4 @@ import json -from graphrag_sdk.fixtures.regex import * import logging import re diff --git a/graphrag_sdk/document_loaders/pdf.py b/graphrag_sdk/document_loaders/pdf.py index 573a2fb..7b01d9b 100644 --- a/graphrag_sdk/document_loaders/pdf.py +++ b/graphrag_sdk/document_loaders/pdf.py @@ -15,9 +15,9 @@ def __init__(self, path: str) -> None: """ try: - import pypdf - except ImportError: - raise ImportError( + __import__('pypdf') + except ModuleNotFoundError: + raise ModuleNotFoundError( "pypdf package not found, please install it with " "`pip install pypdf`" ) diff --git a/graphrag_sdk/helpers.py b/graphrag_sdk/helpers.py index 13b5f50..4f51697 100644 --- a/graphrag_sdk/helpers.py +++ b/graphrag_sdk/helpers.py @@ -55,12 +55,12 @@ def stringify_falkordb_response(response): elif not isinstance(response[0], list): data = str(response).strip() else: - for l, _ in enumerate(response): - if not isinstance(response[l], list): - response[l] = str(response[l]) + for line, _ in enumerate(response): + if not isinstance(response[line], list): + response[line] = str(response[line]) else: - for i, __ in enumerate(response[l]): - response[l][i] = str(response[l][i]) + for i, __ in enumerate(response[line]): + response[line][i] = str(response[line][i]) data = str(response).strip() return data diff --git a/graphrag_sdk/models/litellm.py b/graphrag_sdk/models/litellm.py index 288e6a1..92cd960 100644 --- a/graphrag_sdk/models/litellm.py +++ b/graphrag_sdk/models/litellm.py @@ -74,7 +74,7 @@ def check_valid_key(self, model: str): model=model, messages=messages, max_tokens=10 ) return True - except: + except: # noqa: E722 return False def check_and_pull_model(self) -> None: diff --git a/graphrag_sdk/orchestrator/__init__.py b/graphrag_sdk/orchestrator/__init__.py index 3b34d10..c0a0dd4 100644 --- a/graphrag_sdk/orchestrator/__init__.py +++ b/graphrag_sdk/orchestrator/__init__.py @@ -1,7 +1,6 @@ from .orchestrator import Orchestrator from .orchestrator_runner import OrchestratorRunner from .execution_plan import ExecutionPlan -from .step import StepResult, PlanStep, StepBlockType __all__ = [ 'Orchestrator', diff --git a/graphrag_sdk/orchestrator/execution_plan.py b/graphrag_sdk/orchestrator/execution_plan.py index 5f9ba08..b1beb47 100644 --- a/graphrag_sdk/orchestrator/execution_plan.py +++ b/graphrag_sdk/orchestrator/execution_plan.py @@ -1,5 +1,5 @@ from json import loads -from graphrag_sdk.orchestrator.step import PlanStep, StepBlockType +from graphrag_sdk.orchestrator.step import PlanStep class ExecutionPlan: diff --git a/graphrag_sdk/orchestrator/orchestrator.py b/graphrag_sdk/orchestrator/orchestrator.py index 1db76ca..791676c 100644 --- a/graphrag_sdk/orchestrator/orchestrator.py +++ b/graphrag_sdk/orchestrator/orchestrator.py @@ -1,6 +1,5 @@ from graphrag_sdk.agents import Agent from graphrag_sdk.models import GenerativeModel -from graphrag_sdk.models.model import OutputMethod from .orchestrator_runner import OrchestratorRunner from graphrag_sdk.fixtures.prompts import ( ORCHESTRATOR_SYSTEM, diff --git a/graphrag_sdk/orchestrator/steps/parallel.py b/graphrag_sdk/orchestrator/steps/parallel.py index 90a3362..3763fca 100644 --- a/graphrag_sdk/orchestrator/steps/parallel.py +++ b/graphrag_sdk/orchestrator/steps/parallel.py @@ -2,6 +2,7 @@ from concurrent.futures import ThreadPoolExecutor, wait from graphrag_sdk.orchestrator.step_result import StepResult from graphrag_sdk.orchestrator.orchestrator_runner import OrchestratorRunner +from graphrag_sdk.orchestrator.step import PlanStep class ParallelStepResult(StepResult): @@ -34,16 +35,16 @@ def output(self) -> str: class ParallelProperties: - steps: list["PlanStep"] + steps: list[PlanStep] - def __init__(self, steps: list["PlanStep"]): + def __init__(self, steps: list[PlanStep]): self.steps = steps @staticmethod def from_json(json: dict) -> "ParallelProperties": return ParallelProperties( [ - graphrag_sdk.orchestrator.step.PlanStep.from_json(step) + PlanStep.from_json(step) for step in (json if isinstance(json, list) else json["steps"]) ] ) @@ -58,7 +59,7 @@ def __repr__(self) -> str: return str(self) -class ParallelStep(graphrag_sdk.orchestrator.step.PlanStep): +class ParallelStep(PlanStep): def __init__(self, id: str, properties: ParallelProperties): self._id = id diff --git a/graphrag_sdk/orchestrator/steps/summary.py b/graphrag_sdk/orchestrator/steps/summary.py index edeb547..d01fc61 100644 --- a/graphrag_sdk/orchestrator/steps/summary.py +++ b/graphrag_sdk/orchestrator/steps/summary.py @@ -1,6 +1,5 @@ import graphrag_sdk.orchestrator.step from graphrag_sdk.orchestrator.step_result import StepResult -from concurrent.futures import ThreadPoolExecutor, wait from graphrag_sdk.orchestrator.orchestrator_runner import OrchestratorRunner from graphrag_sdk.fixtures.prompts import ORCHESTRATOR_SUMMARY_PROMPT diff --git a/graphrag_sdk/source.py b/graphrag_sdk/source.py index 9d29e09..f856bb4 100644 --- a/graphrag_sdk/source.py +++ b/graphrag_sdk/source.py @@ -1,5 +1,5 @@ from typing import Iterator -from abc import ABC, abstractmethod +from abc import ABC from graphrag_sdk.document import Document from graphrag_sdk.document_loaders import ( PDFLoader, diff --git a/graphrag_sdk/steps/create_ontology_step.py b/graphrag_sdk/steps/create_ontology_step.py index 5df9ea8..2d52352 100644 --- a/graphrag_sdk/steps/create_ontology_step.py +++ b/graphrag_sdk/steps/create_ontology_step.py @@ -5,7 +5,6 @@ from threading import Lock from typing import Optional from graphrag_sdk.steps.Step import Step -from graphrag_sdk.document import Document from graphrag_sdk.ontology import Ontology from graphrag_sdk.helpers import extract_json from ratelimit import limits, sleep_and_retry @@ -138,7 +137,7 @@ def _process_source( data = json.loads(extract_json(combined_text)) except json.decoder.JSONDecodeError as e: logger.debug(f"Error extracting JSON: {e}") - logger.debug(f"Prompting model to fix JSON") + logger.debug("Prompting model to fix JSON") json_fix_response = self._call_model( self._create_chat(), FIX_JSON_PROMPT.format(json=combined_text, error=str(e)), @@ -170,7 +169,7 @@ def _process_source( return o def _fix_ontology(self, chat_session: GenerativeModelChatSession, o: Ontology): - logger.debug(f"Fixing ontology...") + logger.debug("Fixing ontology...") user_message = FIX_ONTOLOGY_PROMPT.format(ontology=o) @@ -196,7 +195,7 @@ def _fix_ontology(self, chat_session: GenerativeModelChatSession, o: Ontology): data = json.loads(extract_json(combined_text)) except json.decoder.JSONDecodeError as e: logger.debug(f"Error extracting JSON: {e}") - logger.debug(f"Prompting model to fix JSON") + logger.debug("Prompting model to fix JSON") json_fix_response = self._call_model( self._create_chat(), FIX_JSON_PROMPT.format(json=combined_text, error=str(e)), diff --git a/graphrag_sdk/steps/extract_data_step.py b/graphrag_sdk/steps/extract_data_step.py index e2b9632..093c82b 100644 --- a/graphrag_sdk/steps/extract_data_step.py +++ b/graphrag_sdk/steps/extract_data_step.py @@ -7,7 +7,6 @@ from falkordb import Graph from threading import Lock from graphrag_sdk.steps.Step import Step -from graphrag_sdk.document import Document from ratelimit import limits, sleep_and_retry from graphrag_sdk.source import AbstractSource from graphrag_sdk.models.model import OutputMethod @@ -174,7 +173,7 @@ def _process_source( data = json.loads(extract_json(last_respond)) except Exception as e: _task_logger.debug(f"Error extracting JSON: {e}") - _task_logger.debug(f"Prompting model to fix JSON") + _task_logger.debug("Prompting model to fix JSON") json_fix_response = self._call_model( self._create_chat(), FIX_JSON_PROMPT.format(json=last_respond, error=str(e)), @@ -188,7 +187,7 @@ def _process_source( f"Invalid data format. Missing entities or relations. {data}" ) raise Exception( - f"Invalid data format. Missing 'entities' or 'relations' in JSON." + "Invalid data format. Missing 'entities' or 'relations' in JSON." ) for entity in data["entities"]: try: diff --git a/poetry.lock b/poetry.lock index 4be1f71..f600b18 100644 --- a/poetry.lock +++ b/poetry.lock @@ -13,87 +13,87 @@ files = [ [[package]] name = "aiohttp" -version = "3.11.10" +version = "3.11.11" description = "Async http client/server framework (asyncio)" optional = true python-versions = ">=3.9" files = [ - {file = "aiohttp-3.11.10-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:cbad88a61fa743c5d283ad501b01c153820734118b65aee2bd7dbb735475ce0d"}, - {file = "aiohttp-3.11.10-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:80886dac673ceaef499de2f393fc80bb4481a129e6cb29e624a12e3296cc088f"}, - {file = "aiohttp-3.11.10-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:61b9bae80ed1f338c42f57c16918853dc51775fb5cb61da70d590de14d8b5fb4"}, - {file = "aiohttp-3.11.10-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9e2e576caec5c6a6b93f41626c9c02fc87cd91538b81a3670b2e04452a63def6"}, - {file = "aiohttp-3.11.10-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:02c13415b5732fb6ee7ff64583a5e6ed1c57aa68f17d2bda79c04888dfdc2769"}, - {file = "aiohttp-3.11.10-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4cfce37f31f20800a6a6620ce2cdd6737b82e42e06e6e9bd1b36f546feb3c44f"}, - {file = "aiohttp-3.11.10-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3bbbfff4c679c64e6e23cb213f57cc2c9165c9a65d63717108a644eb5a7398df"}, - {file = "aiohttp-3.11.10-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:49c7dbbc1a559ae14fc48387a115b7d4bbc84b4a2c3b9299c31696953c2a5219"}, - {file = "aiohttp-3.11.10-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:68386d78743e6570f054fe7949d6cb37ef2b672b4d3405ce91fafa996f7d9b4d"}, - {file = "aiohttp-3.11.10-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:9ef405356ba989fb57f84cac66f7b0260772836191ccefbb987f414bcd2979d9"}, - {file = "aiohttp-3.11.10-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:5d6958671b296febe7f5f859bea581a21c1d05430d1bbdcf2b393599b1cdce77"}, - {file = "aiohttp-3.11.10-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:99b7920e7165be5a9e9a3a7f1b680f06f68ff0d0328ff4079e5163990d046767"}, - {file = "aiohttp-3.11.10-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:0dc49f42422163efb7e6f1df2636fe3db72713f6cd94688e339dbe33fe06d61d"}, - {file = "aiohttp-3.11.10-cp310-cp310-win32.whl", hash = "sha256:40d1c7a7f750b5648642586ba7206999650208dbe5afbcc5284bcec6579c9b91"}, - {file = "aiohttp-3.11.10-cp310-cp310-win_amd64.whl", hash = "sha256:68ff6f48b51bd78ea92b31079817aff539f6c8fc80b6b8d6ca347d7c02384e33"}, - {file = "aiohttp-3.11.10-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:77c4aa15a89847b9891abf97f3d4048f3c2d667e00f8a623c89ad2dccee6771b"}, - {file = "aiohttp-3.11.10-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:909af95a72cedbefe5596f0bdf3055740f96c1a4baa0dd11fd74ca4de0b4e3f1"}, - {file = "aiohttp-3.11.10-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:386fbe79863eb564e9f3615b959e28b222259da0c48fd1be5929ac838bc65683"}, - {file = "aiohttp-3.11.10-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3de34936eb1a647aa919655ff8d38b618e9f6b7f250cc19a57a4bf7fd2062b6d"}, - {file = "aiohttp-3.11.10-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0c9527819b29cd2b9f52033e7fb9ff08073df49b4799c89cb5754624ecd98299"}, - {file = "aiohttp-3.11.10-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:65a96e3e03300b41f261bbfd40dfdbf1c301e87eab7cd61c054b1f2e7c89b9e8"}, - {file = "aiohttp-3.11.10-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:98f5635f7b74bcd4f6f72fcd85bea2154b323a9f05226a80bc7398d0c90763b0"}, - {file = "aiohttp-3.11.10-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:03b6002e20938fc6ee0918c81d9e776bebccc84690e2b03ed132331cca065ee5"}, - {file = "aiohttp-3.11.10-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6362cc6c23c08d18ddbf0e8c4d5159b5df74fea1a5278ff4f2c79aed3f4e9f46"}, - {file = "aiohttp-3.11.10-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:3691ed7726fef54e928fe26344d930c0c8575bc968c3e239c2e1a04bd8cf7838"}, - {file = "aiohttp-3.11.10-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:31d5093d3acd02b31c649d3a69bb072d539d4c7659b87caa4f6d2bcf57c2fa2b"}, - {file = "aiohttp-3.11.10-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:8b3cf2dc0f0690a33f2d2b2cb15db87a65f1c609f53c37e226f84edb08d10f52"}, - {file = "aiohttp-3.11.10-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:fbbaea811a2bba171197b08eea288b9402faa2bab2ba0858eecdd0a4105753a3"}, - {file = "aiohttp-3.11.10-cp311-cp311-win32.whl", hash = "sha256:4b2c7ac59c5698a7a8207ba72d9e9c15b0fc484a560be0788b31312c2c5504e4"}, - {file = "aiohttp-3.11.10-cp311-cp311-win_amd64.whl", hash = "sha256:974d3a2cce5fcfa32f06b13ccc8f20c6ad9c51802bb7f829eae8a1845c4019ec"}, - {file = "aiohttp-3.11.10-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:b78f053a7ecfc35f0451d961dacdc671f4bcbc2f58241a7c820e9d82559844cf"}, - {file = "aiohttp-3.11.10-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:ab7485222db0959a87fbe8125e233b5a6f01f4400785b36e8a7878170d8c3138"}, - {file = "aiohttp-3.11.10-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:cf14627232dfa8730453752e9cdc210966490992234d77ff90bc8dc0dce361d5"}, - {file = "aiohttp-3.11.10-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:076bc454a7e6fd646bc82ea7f98296be0b1219b5e3ef8a488afbdd8e81fbac50"}, - {file = "aiohttp-3.11.10-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:482cafb7dc886bebeb6c9ba7925e03591a62ab34298ee70d3dd47ba966370d2c"}, - {file = "aiohttp-3.11.10-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:bf3d1a519a324af764a46da4115bdbd566b3c73fb793ffb97f9111dbc684fc4d"}, - {file = "aiohttp-3.11.10-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24213ba85a419103e641e55c27dc7ff03536c4873470c2478cce3311ba1eee7b"}, - {file = "aiohttp-3.11.10-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b99acd4730ad1b196bfb03ee0803e4adac371ae8efa7e1cbc820200fc5ded109"}, - {file = "aiohttp-3.11.10-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:14cdb5a9570be5a04eec2ace174a48ae85833c2aadc86de68f55541f66ce42ab"}, - {file = "aiohttp-3.11.10-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:7e97d622cb083e86f18317282084bc9fbf261801b0192c34fe4b1febd9f7ae69"}, - {file = "aiohttp-3.11.10-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:012f176945af138abc10c4a48743327a92b4ca9adc7a0e078077cdb5dbab7be0"}, - {file = "aiohttp-3.11.10-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:44224d815853962f48fe124748227773acd9686eba6dc102578defd6fc99e8d9"}, - {file = "aiohttp-3.11.10-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c87bf31b7fdab94ae3adbe4a48e711bfc5f89d21cf4c197e75561def39e223bc"}, - {file = "aiohttp-3.11.10-cp312-cp312-win32.whl", hash = "sha256:06a8e2ee1cbac16fe61e51e0b0c269400e781b13bcfc33f5425912391a542985"}, - {file = "aiohttp-3.11.10-cp312-cp312-win_amd64.whl", hash = "sha256:be2b516f56ea883a3e14dda17059716593526e10fb6303189aaf5503937db408"}, - {file = "aiohttp-3.11.10-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:8cc5203b817b748adccb07f36390feb730b1bc5f56683445bfe924fc270b8816"}, - {file = "aiohttp-3.11.10-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:5ef359ebc6949e3a34c65ce20230fae70920714367c63afd80ea0c2702902ccf"}, - {file = "aiohttp-3.11.10-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:9bca390cb247dbfaec3c664326e034ef23882c3f3bfa5fbf0b56cad0320aaca5"}, - {file = "aiohttp-3.11.10-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:811f23b3351ca532af598405db1093f018edf81368e689d1b508c57dcc6b6a32"}, - {file = "aiohttp-3.11.10-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ddf5f7d877615f6a1e75971bfa5ac88609af3b74796ff3e06879e8422729fd01"}, - {file = "aiohttp-3.11.10-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6ab29b8a0beb6f8eaf1e5049252cfe74adbaafd39ba91e10f18caeb0e99ffb34"}, - {file = "aiohttp-3.11.10-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c49a76c1038c2dd116fa443eba26bbb8e6c37e924e2513574856de3b6516be99"}, - {file = "aiohttp-3.11.10-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7f3dc0e330575f5b134918976a645e79adf333c0a1439dcf6899a80776c9ab39"}, - {file = "aiohttp-3.11.10-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:efb15a17a12497685304b2d976cb4939e55137df7b09fa53f1b6a023f01fcb4e"}, - {file = "aiohttp-3.11.10-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:db1d0b28fcb7f1d35600150c3e4b490775251dea70f894bf15c678fdd84eda6a"}, - {file = "aiohttp-3.11.10-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:15fccaf62a4889527539ecb86834084ecf6e9ea70588efde86e8bc775e0e7542"}, - {file = "aiohttp-3.11.10-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:593c114a2221444f30749cc5e5f4012488f56bd14de2af44fe23e1e9894a9c60"}, - {file = "aiohttp-3.11.10-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:7852bbcb4d0d2f0c4d583f40c3bc750ee033265d80598d0f9cb6f372baa6b836"}, - {file = "aiohttp-3.11.10-cp313-cp313-win32.whl", hash = "sha256:65e55ca7debae8faaffee0ebb4b47a51b4075f01e9b641c31e554fd376595c6c"}, - {file = "aiohttp-3.11.10-cp313-cp313-win_amd64.whl", hash = "sha256:beb39a6d60a709ae3fb3516a1581777e7e8b76933bb88c8f4420d875bb0267c6"}, - {file = "aiohttp-3.11.10-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:0580f2e12de2138f34debcd5d88894786453a76e98febaf3e8fe5db62d01c9bf"}, - {file = "aiohttp-3.11.10-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:a55d2ad345684e7c3dd2c20d2f9572e9e1d5446d57200ff630e6ede7612e307f"}, - {file = "aiohttp-3.11.10-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:04814571cb72d65a6899db6099e377ed00710bf2e3eafd2985166f2918beaf59"}, - {file = "aiohttp-3.11.10-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e44a9a3c053b90c6f09b1bb4edd880959f5328cf63052503f892c41ea786d99f"}, - {file = "aiohttp-3.11.10-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:502a1464ccbc800b4b1995b302efaf426e8763fadf185e933c2931df7db9a199"}, - {file = "aiohttp-3.11.10-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:613e5169f8ae77b1933e42e418a95931fb4867b2991fc311430b15901ed67079"}, - {file = "aiohttp-3.11.10-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4cca22a61b7fe45da8fc73c3443150c3608750bbe27641fc7558ec5117b27fdf"}, - {file = "aiohttp-3.11.10-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:86a5dfcc39309470bd7b68c591d84056d195428d5d2e0b5ccadfbaf25b026ebc"}, - {file = "aiohttp-3.11.10-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:77ae58586930ee6b2b6f696c82cf8e78c8016ec4795c53e36718365f6959dc82"}, - {file = "aiohttp-3.11.10-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:78153314f26d5abef3239b4a9af20c229c6f3ecb97d4c1c01b22c4f87669820c"}, - {file = "aiohttp-3.11.10-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:98283b94cc0e11c73acaf1c9698dea80c830ca476492c0fe2622bd931f34b487"}, - {file = "aiohttp-3.11.10-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:53bf2097e05c2accc166c142a2090e4c6fd86581bde3fd9b2d3f9e93dda66ac1"}, - {file = "aiohttp-3.11.10-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:c5532f0441fc09c119e1dca18fbc0687e64fbeb45aa4d6a87211ceaee50a74c4"}, - {file = "aiohttp-3.11.10-cp39-cp39-win32.whl", hash = "sha256:47ad15a65fb41c570cd0ad9a9ff8012489e68176e7207ec7b82a0940dddfd8be"}, - {file = "aiohttp-3.11.10-cp39-cp39-win_amd64.whl", hash = "sha256:c6b9e6d7e41656d78e37ce754813fa44b455c3d0d0dced2a047def7dc5570b74"}, - {file = "aiohttp-3.11.10.tar.gz", hash = "sha256:b1fc6b45010a8d0ff9e88f9f2418c6fd408c99c211257334aff41597ebece42e"}, + {file = "aiohttp-3.11.11-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a60804bff28662cbcf340a4d61598891f12eea3a66af48ecfdc975ceec21e3c8"}, + {file = "aiohttp-3.11.11-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4b4fa1cb5f270fb3eab079536b764ad740bb749ce69a94d4ec30ceee1b5940d5"}, + {file = "aiohttp-3.11.11-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:731468f555656767cda219ab42e033355fe48c85fbe3ba83a349631541715ba2"}, + {file = "aiohttp-3.11.11-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb23d8bb86282b342481cad4370ea0853a39e4a32a0042bb52ca6bdde132df43"}, + {file = "aiohttp-3.11.11-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f047569d655f81cb70ea5be942ee5d4421b6219c3f05d131f64088c73bb0917f"}, + {file = "aiohttp-3.11.11-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dd7659baae9ccf94ae5fe8bfaa2c7bc2e94d24611528395ce88d009107e00c6d"}, + {file = "aiohttp-3.11.11-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af01e42ad87ae24932138f154105e88da13ce7d202a6de93fafdafb2883a00ef"}, + {file = "aiohttp-3.11.11-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5854be2f3e5a729800bac57a8d76af464e160f19676ab6aea74bde18ad19d438"}, + {file = "aiohttp-3.11.11-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:6526e5fb4e14f4bbf30411216780c9967c20c5a55f2f51d3abd6de68320cc2f3"}, + {file = "aiohttp-3.11.11-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:85992ee30a31835fc482468637b3e5bd085fa8fe9392ba0bdcbdc1ef5e9e3c55"}, + {file = "aiohttp-3.11.11-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:88a12ad8ccf325a8a5ed80e6d7c3bdc247d66175afedbe104ee2aaca72960d8e"}, + {file = "aiohttp-3.11.11-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:0a6d3fbf2232e3a08c41eca81ae4f1dff3d8f1a30bae415ebe0af2d2458b8a33"}, + {file = "aiohttp-3.11.11-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:84a585799c58b795573c7fa9b84c455adf3e1d72f19a2bf498b54a95ae0d194c"}, + {file = "aiohttp-3.11.11-cp310-cp310-win32.whl", hash = "sha256:bfde76a8f430cf5c5584553adf9926534352251d379dcb266ad2b93c54a29745"}, + {file = "aiohttp-3.11.11-cp310-cp310-win_amd64.whl", hash = "sha256:0fd82b8e9c383af11d2b26f27a478640b6b83d669440c0a71481f7c865a51da9"}, + {file = "aiohttp-3.11.11-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ba74ec819177af1ef7f59063c6d35a214a8fde6f987f7661f4f0eecc468a8f76"}, + {file = "aiohttp-3.11.11-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4af57160800b7a815f3fe0eba9b46bf28aafc195555f1824555fa2cfab6c1538"}, + {file = "aiohttp-3.11.11-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ffa336210cf9cd8ed117011085817d00abe4c08f99968deef0013ea283547204"}, + {file = "aiohttp-3.11.11-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:81b8fe282183e4a3c7a1b72f5ade1094ed1c6345a8f153506d114af5bf8accd9"}, + {file = "aiohttp-3.11.11-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3af41686ccec6a0f2bdc66686dc0f403c41ac2089f80e2214a0f82d001052c03"}, + {file = "aiohttp-3.11.11-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:70d1f9dde0e5dd9e292a6d4d00058737052b01f3532f69c0c65818dac26dc287"}, + {file = "aiohttp-3.11.11-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:249cc6912405917344192b9f9ea5cd5b139d49e0d2f5c7f70bdfaf6b4dbf3a2e"}, + {file = "aiohttp-3.11.11-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0eb98d90b6690827dcc84c246811feeb4e1eea683c0eac6caed7549be9c84665"}, + {file = "aiohttp-3.11.11-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:ec82bf1fda6cecce7f7b915f9196601a1bd1a3079796b76d16ae4cce6d0ef89b"}, + {file = "aiohttp-3.11.11-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:9fd46ce0845cfe28f108888b3ab17abff84ff695e01e73657eec3f96d72eef34"}, + {file = "aiohttp-3.11.11-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:bd176afcf8f5d2aed50c3647d4925d0db0579d96f75a31e77cbaf67d8a87742d"}, + {file = "aiohttp-3.11.11-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:ec2aa89305006fba9ffb98970db6c8221541be7bee4c1d027421d6f6df7d1ce2"}, + {file = "aiohttp-3.11.11-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:92cde43018a2e17d48bb09c79e4d4cb0e236de5063ce897a5e40ac7cb4878773"}, + {file = "aiohttp-3.11.11-cp311-cp311-win32.whl", hash = "sha256:aba807f9569455cba566882c8938f1a549f205ee43c27b126e5450dc9f83cc62"}, + {file = "aiohttp-3.11.11-cp311-cp311-win_amd64.whl", hash = "sha256:ae545f31489548c87b0cced5755cfe5a5308d00407000e72c4fa30b19c3220ac"}, + {file = "aiohttp-3.11.11-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:e595c591a48bbc295ebf47cb91aebf9bd32f3ff76749ecf282ea7f9f6bb73886"}, + {file = "aiohttp-3.11.11-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:3ea1b59dc06396b0b424740a10a0a63974c725b1c64736ff788a3689d36c02d2"}, + {file = "aiohttp-3.11.11-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8811f3f098a78ffa16e0ea36dffd577eb031aea797cbdba81be039a4169e242c"}, + {file = "aiohttp-3.11.11-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bd7227b87a355ce1f4bf83bfae4399b1f5bb42e0259cb9405824bd03d2f4336a"}, + {file = "aiohttp-3.11.11-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d40f9da8cabbf295d3a9dae1295c69975b86d941bc20f0a087f0477fa0a66231"}, + {file = "aiohttp-3.11.11-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ffb3dc385f6bb1568aa974fe65da84723210e5d9707e360e9ecb51f59406cd2e"}, + {file = "aiohttp-3.11.11-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8f5f7515f3552d899c61202d99dcb17d6e3b0de777900405611cd747cecd1b8"}, + {file = "aiohttp-3.11.11-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3499c7ffbfd9c6a3d8d6a2b01c26639da7e43d47c7b4f788016226b1e711caa8"}, + {file = "aiohttp-3.11.11-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8e2bf8029dbf0810c7bfbc3e594b51c4cc9101fbffb583a3923aea184724203c"}, + {file = "aiohttp-3.11.11-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:b6212a60e5c482ef90f2d788835387070a88d52cf6241d3916733c9176d39eab"}, + {file = "aiohttp-3.11.11-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:d119fafe7b634dbfa25a8c597718e69a930e4847f0b88e172744be24515140da"}, + {file = "aiohttp-3.11.11-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:6fba278063559acc730abf49845d0e9a9e1ba74f85f0ee6efd5803f08b285853"}, + {file = "aiohttp-3.11.11-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:92fc484e34b733704ad77210c7957679c5c3877bd1e6b6d74b185e9320cc716e"}, + {file = "aiohttp-3.11.11-cp312-cp312-win32.whl", hash = "sha256:9f5b3c1ed63c8fa937a920b6c1bec78b74ee09593b3f5b979ab2ae5ef60d7600"}, + {file = "aiohttp-3.11.11-cp312-cp312-win_amd64.whl", hash = "sha256:1e69966ea6ef0c14ee53ef7a3d68b564cc408121ea56c0caa2dc918c1b2f553d"}, + {file = "aiohttp-3.11.11-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:541d823548ab69d13d23730a06f97460f4238ad2e5ed966aaf850d7c369782d9"}, + {file = "aiohttp-3.11.11-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:929f3ed33743a49ab127c58c3e0a827de0664bfcda566108989a14068f820194"}, + {file = "aiohttp-3.11.11-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:0882c2820fd0132240edbb4a51eb8ceb6eef8181db9ad5291ab3332e0d71df5f"}, + {file = "aiohttp-3.11.11-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b63de12e44935d5aca7ed7ed98a255a11e5cb47f83a9fded7a5e41c40277d104"}, + {file = "aiohttp-3.11.11-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aa54f8ef31d23c506910c21163f22b124facb573bff73930735cf9fe38bf7dff"}, + {file = "aiohttp-3.11.11-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a344d5dc18074e3872777b62f5f7d584ae4344cd6006c17ba12103759d407af3"}, + {file = "aiohttp-3.11.11-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0b7fb429ab1aafa1f48578eb315ca45bd46e9c37de11fe45c7f5f4138091e2f1"}, + {file = "aiohttp-3.11.11-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c341c7d868750e31961d6d8e60ff040fb9d3d3a46d77fd85e1ab8e76c3e9a5c4"}, + {file = "aiohttp-3.11.11-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ed9ee95614a71e87f1a70bc81603f6c6760128b140bc4030abe6abaa988f1c3d"}, + {file = "aiohttp-3.11.11-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:de8d38f1c2810fa2a4f1d995a2e9c70bb8737b18da04ac2afbf3971f65781d87"}, + {file = "aiohttp-3.11.11-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:a9b7371665d4f00deb8f32208c7c5e652059b0fda41cf6dbcac6114a041f1cc2"}, + {file = "aiohttp-3.11.11-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:620598717fce1b3bd14dd09947ea53e1ad510317c85dda2c9c65b622edc96b12"}, + {file = "aiohttp-3.11.11-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:bf8d9bfee991d8acc72d060d53860f356e07a50f0e0d09a8dfedea1c554dd0d5"}, + {file = "aiohttp-3.11.11-cp313-cp313-win32.whl", hash = "sha256:9d73ee3725b7a737ad86c2eac5c57a4a97793d9f442599bea5ec67ac9f4bdc3d"}, + {file = "aiohttp-3.11.11-cp313-cp313-win_amd64.whl", hash = "sha256:c7a06301c2fb096bdb0bd25fe2011531c1453b9f2c163c8031600ec73af1cc99"}, + {file = "aiohttp-3.11.11-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:3e23419d832d969f659c208557de4a123e30a10d26e1e14b73431d3c13444c2e"}, + {file = "aiohttp-3.11.11-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:21fef42317cf02e05d3b09c028712e1d73a9606f02467fd803f7c1f39cc59add"}, + {file = "aiohttp-3.11.11-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1f21bb8d0235fc10c09ce1d11ffbd40fc50d3f08a89e4cf3a0c503dc2562247a"}, + {file = "aiohttp-3.11.11-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1642eceeaa5ab6c9b6dfeaaa626ae314d808188ab23ae196a34c9d97efb68350"}, + {file = "aiohttp-3.11.11-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2170816e34e10f2fd120f603e951630f8a112e1be3b60963a1f159f5699059a6"}, + {file = "aiohttp-3.11.11-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8be8508d110d93061197fd2d6a74f7401f73b6d12f8822bbcd6d74f2b55d71b1"}, + {file = "aiohttp-3.11.11-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4eed954b161e6b9b65f6be446ed448ed3921763cc432053ceb606f89d793927e"}, + {file = "aiohttp-3.11.11-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d6c9af134da4bc9b3bd3e6a70072509f295d10ee60c697826225b60b9959acdd"}, + {file = "aiohttp-3.11.11-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:44167fc6a763d534a6908bdb2592269b4bf30a03239bcb1654781adf5e49caf1"}, + {file = "aiohttp-3.11.11-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:479b8c6ebd12aedfe64563b85920525d05d394b85f166b7873c8bde6da612f9c"}, + {file = "aiohttp-3.11.11-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:10b4ff0ad793d98605958089fabfa350e8e62bd5d40aa65cdc69d6785859f94e"}, + {file = "aiohttp-3.11.11-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:b540bd67cfb54e6f0865ceccd9979687210d7ed1a1cc8c01f8e67e2f1e883d28"}, + {file = "aiohttp-3.11.11-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:1dac54e8ce2ed83b1f6b1a54005c87dfed139cf3f777fdc8afc76e7841101226"}, + {file = "aiohttp-3.11.11-cp39-cp39-win32.whl", hash = "sha256:568c1236b2fde93b7720f95a890741854c1200fba4a3471ff48b2934d2d93fd3"}, + {file = "aiohttp-3.11.11-cp39-cp39-win_amd64.whl", hash = "sha256:943a8b052e54dfd6439fd7989f67fc6a7f2138d0a2cf0a7de5f18aa4fe7eb3b1"}, + {file = "aiohttp-3.11.11.tar.gz", hash = "sha256:bb49c7f1e6ebf3821a42d81d494f538107610c3a705987f53068546b0e90303e"}, ] [package.dependencies] @@ -147,13 +147,13 @@ files = [ [[package]] name = "anyio" -version = "4.7.0" +version = "4.8.0" description = "High level compatibility layer for multiple asynchronous event loop implementations" optional = false python-versions = ">=3.9" files = [ - {file = "anyio-4.7.0-py3-none-any.whl", hash = "sha256:ea60c3723ab42ba6fff7e8ccb0488c898ec538ff4df1f1d5e642c3601d07e352"}, - {file = "anyio-4.7.0.tar.gz", hash = "sha256:2f834749c602966b7d456a7567cafcb309f96482b5081d14ac93ccd457f9dd48"}, + {file = "anyio-4.8.0-py3-none-any.whl", hash = "sha256:b5011f270ab5eb0abf13385f851315585cc37ef330dd88e27ec3d34d651fd47a"}, + {file = "anyio-4.8.0.tar.gz", hash = "sha256:1d9fe889df5212298c0c0723fa20479d1b94883a2df44bd3897aa91083316f7a"}, ] [package.dependencies] @@ -164,7 +164,7 @@ typing_extensions = {version = ">=4.5", markers = "python_version < \"3.13\""} [package.extras] doc = ["Sphinx (>=7.4,<8.0)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx_rtd_theme"] -test = ["anyio[trio]", "coverage[toml] (>=7)", "exceptiongroup (>=1.2.0)", "hypothesis (>=4.0)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "truststore (>=0.9.1)", "uvloop (>=0.21)"] +test = ["anyio[trio]", "coverage[toml] (>=7)", "exceptiongroup (>=1.2.0)", "hypothesis (>=4.0)", "psutil (>=5.9)", "pytest (>=7.0)", "trustme", "truststore (>=0.9.1)", "uvloop (>=0.21)"] trio = ["trio (>=0.26.1)"] [[package]] @@ -371,6 +371,7 @@ files = [ ] [package.dependencies] +tinycss2 = {version = ">=1.1.0,<1.5", optional = true, markers = "extra == \"css\""} webencodings = "*" [package.extras] @@ -493,127 +494,114 @@ pycparser = "*" [[package]] name = "charset-normalizer" -version = "3.4.0" +version = "3.4.1" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." optional = false -python-versions = ">=3.7.0" +python-versions = ">=3.7" files = [ - {file = "charset_normalizer-3.4.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:4f9fc98dad6c2eaa32fc3af1417d95b5e3d08aff968df0cd320066def971f9a6"}, - {file = "charset_normalizer-3.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0de7b687289d3c1b3e8660d0741874abe7888100efe14bd0f9fd7141bcbda92b"}, - {file = "charset_normalizer-3.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5ed2e36c3e9b4f21dd9422f6893dec0abf2cca553af509b10cd630f878d3eb99"}, - {file = "charset_normalizer-3.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:40d3ff7fc90b98c637bda91c89d51264a3dcf210cade3a2c6f838c7268d7a4ca"}, - {file = "charset_normalizer-3.4.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1110e22af8ca26b90bd6364fe4c763329b0ebf1ee213ba32b68c73de5752323d"}, - {file = "charset_normalizer-3.4.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:86f4e8cca779080f66ff4f191a685ced73d2f72d50216f7112185dc02b90b9b7"}, - {file = "charset_normalizer-3.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7f683ddc7eedd742e2889d2bfb96d69573fde1d92fcb811979cdb7165bb9c7d3"}, - {file = "charset_normalizer-3.4.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:27623ba66c183eca01bf9ff833875b459cad267aeeb044477fedac35e19ba907"}, - {file = "charset_normalizer-3.4.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:f606a1881d2663630ea5b8ce2efe2111740df4b687bd78b34a8131baa007f79b"}, - {file = "charset_normalizer-3.4.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:0b309d1747110feb25d7ed6b01afdec269c647d382c857ef4663bbe6ad95a912"}, - {file = "charset_normalizer-3.4.0-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:136815f06a3ae311fae551c3df1f998a1ebd01ddd424aa5603a4336997629e95"}, - {file = "charset_normalizer-3.4.0-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:14215b71a762336254351b00ec720a8e85cada43b987da5a042e4ce3e82bd68e"}, - {file = "charset_normalizer-3.4.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:79983512b108e4a164b9c8d34de3992f76d48cadc9554c9e60b43f308988aabe"}, - {file = "charset_normalizer-3.4.0-cp310-cp310-win32.whl", hash = "sha256:c94057af19bc953643a33581844649a7fdab902624d2eb739738a30e2b3e60fc"}, - {file = "charset_normalizer-3.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:55f56e2ebd4e3bc50442fbc0888c9d8c94e4e06a933804e2af3e89e2f9c1c749"}, - {file = "charset_normalizer-3.4.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:0d99dd8ff461990f12d6e42c7347fd9ab2532fb70e9621ba520f9e8637161d7c"}, - {file = "charset_normalizer-3.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c57516e58fd17d03ebe67e181a4e4e2ccab1168f8c2976c6a334d4f819fe5944"}, - {file = "charset_normalizer-3.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:6dba5d19c4dfab08e58d5b36304b3f92f3bd5d42c1a3fa37b5ba5cdf6dfcbcee"}, - {file = "charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf4475b82be41b07cc5e5ff94810e6a01f276e37c2d55571e3fe175e467a1a1c"}, - {file = "charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ce031db0408e487fd2775d745ce30a7cd2923667cf3b69d48d219f1d8f5ddeb6"}, - {file = "charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8ff4e7cdfdb1ab5698e675ca622e72d58a6fa2a8aa58195de0c0061288e6e3ea"}, - {file = "charset_normalizer-3.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3710a9751938947e6327ea9f3ea6332a09bf0ba0c09cae9cb1f250bd1f1549bc"}, - {file = "charset_normalizer-3.4.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:82357d85de703176b5587dbe6ade8ff67f9f69a41c0733cf2425378b49954de5"}, - {file = "charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:47334db71978b23ebcf3c0f9f5ee98b8d65992b65c9c4f2d34c2eaf5bcaf0594"}, - {file = "charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:8ce7fd6767a1cc5a92a639b391891bf1c268b03ec7e021c7d6d902285259685c"}, - {file = "charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:f1a2f519ae173b5b6a2c9d5fa3116ce16e48b3462c8b96dfdded11055e3d6365"}, - {file = "charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:63bc5c4ae26e4bc6be6469943b8253c0fd4e4186c43ad46e713ea61a0ba49129"}, - {file = "charset_normalizer-3.4.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:bcb4f8ea87d03bc51ad04add8ceaf9b0f085ac045ab4d74e73bbc2dc033f0236"}, - {file = "charset_normalizer-3.4.0-cp311-cp311-win32.whl", hash = "sha256:9ae4ef0b3f6b41bad6366fb0ea4fc1d7ed051528e113a60fa2a65a9abb5b1d99"}, - {file = "charset_normalizer-3.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:cee4373f4d3ad28f1ab6290684d8e2ebdb9e7a1b74fdc39e4c211995f77bec27"}, - {file = "charset_normalizer-3.4.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:0713f3adb9d03d49d365b70b84775d0a0d18e4ab08d12bc46baa6132ba78aaf6"}, - {file = "charset_normalizer-3.4.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:de7376c29d95d6719048c194a9cf1a1b0393fbe8488a22008610b0361d834ecf"}, - {file = "charset_normalizer-3.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:4a51b48f42d9358460b78725283f04bddaf44a9358197b889657deba38f329db"}, - {file = "charset_normalizer-3.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b295729485b06c1a0683af02a9e42d2caa9db04a373dc38a6a58cdd1e8abddf1"}, - {file = "charset_normalizer-3.4.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ee803480535c44e7f5ad00788526da7d85525cfefaf8acf8ab9a310000be4b03"}, - {file = "charset_normalizer-3.4.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3d59d125ffbd6d552765510e3f31ed75ebac2c7470c7274195b9161a32350284"}, - {file = "charset_normalizer-3.4.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8cda06946eac330cbe6598f77bb54e690b4ca93f593dee1568ad22b04f347c15"}, - {file = "charset_normalizer-3.4.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:07afec21bbbbf8a5cc3651aa96b980afe2526e7f048fdfb7f1014d84acc8b6d8"}, - {file = "charset_normalizer-3.4.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:6b40e8d38afe634559e398cc32b1472f376a4099c75fe6299ae607e404c033b2"}, - {file = "charset_normalizer-3.4.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:b8dcd239c743aa2f9c22ce674a145e0a25cb1566c495928440a181ca1ccf6719"}, - {file = "charset_normalizer-3.4.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:84450ba661fb96e9fd67629b93d2941c871ca86fc38d835d19d4225ff946a631"}, - {file = "charset_normalizer-3.4.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:44aeb140295a2f0659e113b31cfe92c9061622cadbc9e2a2f7b8ef6b1e29ef4b"}, - {file = "charset_normalizer-3.4.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:1db4e7fefefd0f548d73e2e2e041f9df5c59e178b4c72fbac4cc6f535cfb1565"}, - {file = "charset_normalizer-3.4.0-cp312-cp312-win32.whl", hash = "sha256:5726cf76c982532c1863fb64d8c6dd0e4c90b6ece9feb06c9f202417a31f7dd7"}, - {file = "charset_normalizer-3.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:b197e7094f232959f8f20541ead1d9862ac5ebea1d58e9849c1bf979255dfac9"}, - {file = "charset_normalizer-3.4.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:dd4eda173a9fcccb5f2e2bd2a9f423d180194b1bf17cf59e3269899235b2a114"}, - {file = "charset_normalizer-3.4.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e9e3c4c9e1ed40ea53acf11e2a386383c3304212c965773704e4603d589343ed"}, - {file = "charset_normalizer-3.4.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:92a7e36b000bf022ef3dbb9c46bfe2d52c047d5e3f3343f43204263c5addc250"}, - {file = "charset_normalizer-3.4.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:54b6a92d009cbe2fb11054ba694bc9e284dad30a26757b1e372a1fdddaf21920"}, - {file = "charset_normalizer-3.4.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1ffd9493de4c922f2a38c2bf62b831dcec90ac673ed1ca182fe11b4d8e9f2a64"}, - {file = "charset_normalizer-3.4.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:35c404d74c2926d0287fbd63ed5d27eb911eb9e4a3bb2c6d294f3cfd4a9e0c23"}, - {file = "charset_normalizer-3.4.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4796efc4faf6b53a18e3d46343535caed491776a22af773f366534056c4e1fbc"}, - {file = "charset_normalizer-3.4.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e7fdd52961feb4c96507aa649550ec2a0d527c086d284749b2f582f2d40a2e0d"}, - {file = "charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:92db3c28b5b2a273346bebb24857fda45601aef6ae1c011c0a997106581e8a88"}, - {file = "charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:ab973df98fc99ab39080bfb0eb3a925181454d7c3ac8a1e695fddfae696d9e90"}, - {file = "charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:4b67fdab07fdd3c10bb21edab3cbfe8cf5696f453afce75d815d9d7223fbe88b"}, - {file = "charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:aa41e526a5d4a9dfcfbab0716c7e8a1b215abd3f3df5a45cf18a12721d31cb5d"}, - {file = "charset_normalizer-3.4.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ffc519621dce0c767e96b9c53f09c5d215578e10b02c285809f76509a3931482"}, - {file = "charset_normalizer-3.4.0-cp313-cp313-win32.whl", hash = "sha256:f19c1585933c82098c2a520f8ec1227f20e339e33aca8fa6f956f6691b784e67"}, - {file = "charset_normalizer-3.4.0-cp313-cp313-win_amd64.whl", hash = "sha256:707b82d19e65c9bd28b81dde95249b07bf9f5b90ebe1ef17d9b57473f8a64b7b"}, - {file = "charset_normalizer-3.4.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:dbe03226baf438ac4fda9e2d0715022fd579cb641c4cf639fa40d53b2fe6f3e2"}, - {file = "charset_normalizer-3.4.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dd9a8bd8900e65504a305bf8ae6fa9fbc66de94178c420791d0293702fce2df7"}, - {file = "charset_normalizer-3.4.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b8831399554b92b72af5932cdbbd4ddc55c55f631bb13ff8fe4e6536a06c5c51"}, - {file = "charset_normalizer-3.4.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a14969b8691f7998e74663b77b4c36c0337cb1df552da83d5c9004a93afdb574"}, - {file = "charset_normalizer-3.4.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dcaf7c1524c0542ee2fc82cc8ec337f7a9f7edee2532421ab200d2b920fc97cf"}, - {file = "charset_normalizer-3.4.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:425c5f215d0eecee9a56cdb703203dda90423247421bf0d67125add85d0c4455"}, - {file = "charset_normalizer-3.4.0-cp37-cp37m-musllinux_1_2_aarch64.whl", hash = "sha256:d5b054862739d276e09928de37c79ddeec42a6e1bfc55863be96a36ba22926f6"}, - {file = "charset_normalizer-3.4.0-cp37-cp37m-musllinux_1_2_i686.whl", hash = "sha256:f3e73a4255342d4eb26ef6df01e3962e73aa29baa3124a8e824c5d3364a65748"}, - {file = "charset_normalizer-3.4.0-cp37-cp37m-musllinux_1_2_ppc64le.whl", hash = "sha256:2f6c34da58ea9c1a9515621f4d9ac379871a8f21168ba1b5e09d74250de5ad62"}, - {file = "charset_normalizer-3.4.0-cp37-cp37m-musllinux_1_2_s390x.whl", hash = "sha256:f09cb5a7bbe1ecae6e87901a2eb23e0256bb524a79ccc53eb0b7629fbe7677c4"}, - {file = "charset_normalizer-3.4.0-cp37-cp37m-musllinux_1_2_x86_64.whl", hash = "sha256:0099d79bdfcf5c1f0c2c72f91516702ebf8b0b8ddd8905f97a8aecf49712c621"}, - {file = "charset_normalizer-3.4.0-cp37-cp37m-win32.whl", hash = "sha256:9c98230f5042f4945f957d006edccc2af1e03ed5e37ce7c373f00a5a4daa6149"}, - {file = "charset_normalizer-3.4.0-cp37-cp37m-win_amd64.whl", hash = "sha256:62f60aebecfc7f4b82e3f639a7d1433a20ec32824db2199a11ad4f5e146ef5ee"}, - {file = "charset_normalizer-3.4.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:af73657b7a68211996527dbfeffbb0864e043d270580c5aef06dc4b659a4b578"}, - {file = "charset_normalizer-3.4.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:cab5d0b79d987c67f3b9e9c53f54a61360422a5a0bc075f43cab5621d530c3b6"}, - {file = "charset_normalizer-3.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:9289fd5dddcf57bab41d044f1756550f9e7cf0c8e373b8cdf0ce8773dc4bd417"}, - {file = "charset_normalizer-3.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b493a043635eb376e50eedf7818f2f322eabbaa974e948bd8bdd29eb7ef2a51"}, - {file = "charset_normalizer-3.4.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9fa2566ca27d67c86569e8c85297aaf413ffab85a8960500f12ea34ff98e4c41"}, - {file = "charset_normalizer-3.4.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a8e538f46104c815be19c975572d74afb53f29650ea2025bbfaef359d2de2f7f"}, - {file = "charset_normalizer-3.4.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6fd30dc99682dc2c603c2b315bded2799019cea829f8bf57dc6b61efde6611c8"}, - {file = "charset_normalizer-3.4.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2006769bd1640bdf4d5641c69a3d63b71b81445473cac5ded39740a226fa88ab"}, - {file = "charset_normalizer-3.4.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:dc15e99b2d8a656f8e666854404f1ba54765871104e50c8e9813af8a7db07f12"}, - {file = "charset_normalizer-3.4.0-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:ab2e5bef076f5a235c3774b4f4028a680432cded7cad37bba0fd90d64b187d19"}, - {file = "charset_normalizer-3.4.0-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:4ec9dd88a5b71abfc74e9df5ebe7921c35cbb3b641181a531ca65cdb5e8e4dea"}, - {file = "charset_normalizer-3.4.0-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:43193c5cda5d612f247172016c4bb71251c784d7a4d9314677186a838ad34858"}, - {file = "charset_normalizer-3.4.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:aa693779a8b50cd97570e5a0f343538a8dbd3e496fa5dcb87e29406ad0299654"}, - {file = "charset_normalizer-3.4.0-cp38-cp38-win32.whl", hash = "sha256:7706f5850360ac01d80c89bcef1640683cc12ed87f42579dab6c5d3ed6888613"}, - {file = "charset_normalizer-3.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:c3e446d253bd88f6377260d07c895816ebf33ffffd56c1c792b13bff9c3e1ade"}, - {file = "charset_normalizer-3.4.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:980b4f289d1d90ca5efcf07958d3eb38ed9c0b7676bf2831a54d4f66f9c27dfa"}, - {file = "charset_normalizer-3.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f28f891ccd15c514a0981f3b9db9aa23d62fe1a99997512b0491d2ed323d229a"}, - {file = "charset_normalizer-3.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a8aacce6e2e1edcb6ac625fb0f8c3a9570ccc7bfba1f63419b3769ccf6a00ed0"}, - {file = "charset_normalizer-3.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bd7af3717683bea4c87acd8c0d3d5b44d56120b26fd3f8a692bdd2d5260c620a"}, - {file = "charset_normalizer-3.4.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5ff2ed8194587faf56555927b3aa10e6fb69d931e33953943bc4f837dfee2242"}, - {file = "charset_normalizer-3.4.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e91f541a85298cf35433bf66f3fab2a4a2cff05c127eeca4af174f6d497f0d4b"}, - {file = "charset_normalizer-3.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:309a7de0a0ff3040acaebb35ec45d18db4b28232f21998851cfa709eeff49d62"}, - {file = "charset_normalizer-3.4.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:285e96d9d53422efc0d7a17c60e59f37fbf3dfa942073f666db4ac71e8d726d0"}, - {file = "charset_normalizer-3.4.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:5d447056e2ca60382d460a604b6302d8db69476fd2015c81e7c35417cfabe4cd"}, - {file = "charset_normalizer-3.4.0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:20587d20f557fe189b7947d8e7ec5afa110ccf72a3128d61a2a387c3313f46be"}, - {file = "charset_normalizer-3.4.0-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:130272c698667a982a5d0e626851ceff662565379baf0ff2cc58067b81d4f11d"}, - {file = "charset_normalizer-3.4.0-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:ab22fbd9765e6954bc0bcff24c25ff71dcbfdb185fcdaca49e81bac68fe724d3"}, - {file = "charset_normalizer-3.4.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:7782afc9b6b42200f7362858f9e73b1f8316afb276d316336c0ec3bd73312742"}, - {file = "charset_normalizer-3.4.0-cp39-cp39-win32.whl", hash = "sha256:2de62e8801ddfff069cd5c504ce3bc9672b23266597d4e4f50eda28846c322f2"}, - {file = "charset_normalizer-3.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:95c3c157765b031331dd4db3c775e58deaee050a3042fcad72cbc4189d7c8dca"}, - {file = "charset_normalizer-3.4.0-py3-none-any.whl", hash = "sha256:fe9f97feb71aa9896b81973a7bbada8c49501dc73e58a10fcef6663af95e5079"}, - {file = "charset_normalizer-3.4.0.tar.gz", hash = "sha256:223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e"}, + {file = "charset_normalizer-3.4.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:91b36a978b5ae0ee86c394f5a54d6ef44db1de0815eb43de826d41d21e4af3de"}, + {file = "charset_normalizer-3.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7461baadb4dc00fd9e0acbe254e3d7d2112e7f92ced2adc96e54ef6501c5f176"}, + {file = "charset_normalizer-3.4.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e218488cd232553829be0664c2292d3af2eeeb94b32bea483cf79ac6a694e037"}, + {file = "charset_normalizer-3.4.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:80ed5e856eb7f30115aaf94e4a08114ccc8813e6ed1b5efa74f9f82e8509858f"}, + {file = "charset_normalizer-3.4.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b010a7a4fd316c3c484d482922d13044979e78d1861f0e0650423144c616a46a"}, + {file = "charset_normalizer-3.4.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4532bff1b8421fd0a320463030c7520f56a79c9024a4e88f01c537316019005a"}, + {file = "charset_normalizer-3.4.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:d973f03c0cb71c5ed99037b870f2be986c3c05e63622c017ea9816881d2dd247"}, + {file = "charset_normalizer-3.4.1-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:3a3bd0dcd373514dcec91c411ddb9632c0d7d92aed7093b8c3bbb6d69ca74408"}, + {file = "charset_normalizer-3.4.1-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:d9c3cdf5390dcd29aa8056d13e8e99526cda0305acc038b96b30352aff5ff2bb"}, + {file = "charset_normalizer-3.4.1-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:2bdfe3ac2e1bbe5b59a1a63721eb3b95fc9b6817ae4a46debbb4e11f6232428d"}, + {file = "charset_normalizer-3.4.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:eab677309cdb30d047996b36d34caeda1dc91149e4fdca0b1a039b3f79d9a807"}, + {file = "charset_normalizer-3.4.1-cp310-cp310-win32.whl", hash = "sha256:c0429126cf75e16c4f0ad00ee0eae4242dc652290f940152ca8c75c3a4b6ee8f"}, + {file = "charset_normalizer-3.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:9f0b8b1c6d84c8034a44893aba5e767bf9c7a211e313a9605d9c617d7083829f"}, + {file = "charset_normalizer-3.4.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:8bfa33f4f2672964266e940dd22a195989ba31669bd84629f05fab3ef4e2d125"}, + {file = "charset_normalizer-3.4.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28bf57629c75e810b6ae989f03c0828d64d6b26a5e205535585f96093e405ed1"}, + {file = "charset_normalizer-3.4.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f08ff5e948271dc7e18a35641d2f11a4cd8dfd5634f55228b691e62b37125eb3"}, + {file = "charset_normalizer-3.4.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:234ac59ea147c59ee4da87a0c0f098e9c8d169f4dc2a159ef720f1a61bbe27cd"}, + {file = "charset_normalizer-3.4.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fd4ec41f914fa74ad1b8304bbc634b3de73d2a0889bd32076342a573e0779e00"}, + {file = "charset_normalizer-3.4.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:eea6ee1db730b3483adf394ea72f808b6e18cf3cb6454b4d86e04fa8c4327a12"}, + {file = "charset_normalizer-3.4.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c96836c97b1238e9c9e3fe90844c947d5afbf4f4c92762679acfe19927d81d77"}, + {file = "charset_normalizer-3.4.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:4d86f7aff21ee58f26dcf5ae81a9addbd914115cdebcbb2217e4f0ed8982e146"}, + {file = "charset_normalizer-3.4.1-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:09b5e6733cbd160dcc09589227187e242a30a49ca5cefa5a7edd3f9d19ed53fd"}, + {file = "charset_normalizer-3.4.1-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:5777ee0881f9499ed0f71cc82cf873d9a0ca8af166dfa0af8ec4e675b7df48e6"}, + {file = "charset_normalizer-3.4.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:237bdbe6159cff53b4f24f397d43c6336c6b0b42affbe857970cefbb620911c8"}, + {file = "charset_normalizer-3.4.1-cp311-cp311-win32.whl", hash = "sha256:8417cb1f36cc0bc7eaba8ccb0e04d55f0ee52df06df3ad55259b9a323555fc8b"}, + {file = "charset_normalizer-3.4.1-cp311-cp311-win_amd64.whl", hash = "sha256:d7f50a1f8c450f3925cb367d011448c39239bb3eb4117c36a6d354794de4ce76"}, + {file = "charset_normalizer-3.4.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:73d94b58ec7fecbc7366247d3b0b10a21681004153238750bb67bd9012414545"}, + {file = "charset_normalizer-3.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dad3e487649f498dd991eeb901125411559b22e8d7ab25d3aeb1af367df5efd7"}, + {file = "charset_normalizer-3.4.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c30197aa96e8eed02200a83fba2657b4c3acd0f0aa4bdc9f6c1af8e8962e0757"}, + {file = "charset_normalizer-3.4.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2369eea1ee4a7610a860d88f268eb39b95cb588acd7235e02fd5a5601773d4fa"}, + {file = "charset_normalizer-3.4.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc2722592d8998c870fa4e290c2eec2c1569b87fe58618e67d38b4665dfa680d"}, + {file = "charset_normalizer-3.4.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ffc9202a29ab3920fa812879e95a9e78b2465fd10be7fcbd042899695d75e616"}, + {file = "charset_normalizer-3.4.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:804a4d582ba6e5b747c625bf1255e6b1507465494a40a2130978bda7b932c90b"}, + {file = "charset_normalizer-3.4.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:0f55e69f030f7163dffe9fd0752b32f070566451afe180f99dbeeb81f511ad8d"}, + {file = "charset_normalizer-3.4.1-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:c4c3e6da02df6fa1410a7680bd3f63d4f710232d3139089536310d027950696a"}, + {file = "charset_normalizer-3.4.1-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:5df196eb874dae23dcfb968c83d4f8fdccb333330fe1fc278ac5ceeb101003a9"}, + {file = "charset_normalizer-3.4.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e358e64305fe12299a08e08978f51fc21fac060dcfcddd95453eabe5b93ed0e1"}, + {file = "charset_normalizer-3.4.1-cp312-cp312-win32.whl", hash = "sha256:9b23ca7ef998bc739bf6ffc077c2116917eabcc901f88da1b9856b210ef63f35"}, + {file = "charset_normalizer-3.4.1-cp312-cp312-win_amd64.whl", hash = "sha256:6ff8a4a60c227ad87030d76e99cd1698345d4491638dfa6673027c48b3cd395f"}, + {file = "charset_normalizer-3.4.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:aabfa34badd18f1da5ec1bc2715cadc8dca465868a4e73a0173466b688f29dda"}, + {file = "charset_normalizer-3.4.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22e14b5d70560b8dd51ec22863f370d1e595ac3d024cb8ad7d308b4cd95f8313"}, + {file = "charset_normalizer-3.4.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8436c508b408b82d87dc5f62496973a1805cd46727c34440b0d29d8a2f50a6c9"}, + {file = "charset_normalizer-3.4.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2d074908e1aecee37a7635990b2c6d504cd4766c7bc9fc86d63f9c09af3fa11b"}, + {file = "charset_normalizer-3.4.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:955f8851919303c92343d2f66165294848d57e9bba6cf6e3625485a70a038d11"}, + {file = "charset_normalizer-3.4.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:44ecbf16649486d4aebafeaa7ec4c9fed8b88101f4dd612dcaf65d5e815f837f"}, + {file = "charset_normalizer-3.4.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:0924e81d3d5e70f8126529951dac65c1010cdf117bb75eb02dd12339b57749dd"}, + {file = "charset_normalizer-3.4.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:2967f74ad52c3b98de4c3b32e1a44e32975e008a9cd2a8cc8966d6a5218c5cb2"}, + {file = "charset_normalizer-3.4.1-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:c75cb2a3e389853835e84a2d8fb2b81a10645b503eca9bcb98df6b5a43eb8886"}, + {file = "charset_normalizer-3.4.1-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:09b26ae6b1abf0d27570633b2b078a2a20419c99d66fb2823173d73f188ce601"}, + {file = "charset_normalizer-3.4.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:fa88b843d6e211393a37219e6a1c1df99d35e8fd90446f1118f4216e307e48cd"}, + {file = "charset_normalizer-3.4.1-cp313-cp313-win32.whl", hash = "sha256:eb8178fe3dba6450a3e024e95ac49ed3400e506fd4e9e5c32d30adda88cbd407"}, + {file = "charset_normalizer-3.4.1-cp313-cp313-win_amd64.whl", hash = "sha256:b1ac5992a838106edb89654e0aebfc24f5848ae2547d22c2c3f66454daa11971"}, + {file = "charset_normalizer-3.4.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f30bf9fd9be89ecb2360c7d94a711f00c09b976258846efe40db3d05828e8089"}, + {file = "charset_normalizer-3.4.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:97f68b8d6831127e4787ad15e6757232e14e12060bec17091b85eb1486b91d8d"}, + {file = "charset_normalizer-3.4.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7974a0b5ecd505609e3b19742b60cee7aa2aa2fb3151bc917e6e2646d7667dcf"}, + {file = "charset_normalizer-3.4.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fc54db6c8593ef7d4b2a331b58653356cf04f67c960f584edb7c3d8c97e8f39e"}, + {file = "charset_normalizer-3.4.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:311f30128d7d333eebd7896965bfcfbd0065f1716ec92bd5638d7748eb6f936a"}, + {file = "charset_normalizer-3.4.1-cp37-cp37m-musllinux_1_2_aarch64.whl", hash = "sha256:7d053096f67cd1241601111b698f5cad775f97ab25d81567d3f59219b5f1adbd"}, + {file = "charset_normalizer-3.4.1-cp37-cp37m-musllinux_1_2_i686.whl", hash = "sha256:807f52c1f798eef6cf26beb819eeb8819b1622ddfeef9d0977a8502d4db6d534"}, + {file = "charset_normalizer-3.4.1-cp37-cp37m-musllinux_1_2_ppc64le.whl", hash = "sha256:dccbe65bd2f7f7ec22c4ff99ed56faa1e9f785482b9bbd7c717e26fd723a1d1e"}, + {file = "charset_normalizer-3.4.1-cp37-cp37m-musllinux_1_2_s390x.whl", hash = "sha256:2fb9bd477fdea8684f78791a6de97a953c51831ee2981f8e4f583ff3b9d9687e"}, + {file = "charset_normalizer-3.4.1-cp37-cp37m-musllinux_1_2_x86_64.whl", hash = "sha256:01732659ba9b5b873fc117534143e4feefecf3b2078b0a6a2e925271bb6f4cfa"}, + {file = "charset_normalizer-3.4.1-cp37-cp37m-win32.whl", hash = "sha256:7a4f97a081603d2050bfaffdefa5b02a9ec823f8348a572e39032caa8404a487"}, + {file = "charset_normalizer-3.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:7b1bef6280950ee6c177b326508f86cad7ad4dff12454483b51d8b7d673a2c5d"}, + {file = "charset_normalizer-3.4.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:ecddf25bee22fe4fe3737a399d0d177d72bc22be6913acfab364b40bce1ba83c"}, + {file = "charset_normalizer-3.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8c60ca7339acd497a55b0ea5d506b2a2612afb2826560416f6894e8b5770d4a9"}, + {file = "charset_normalizer-3.4.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b7b2d86dd06bfc2ade3312a83a5c364c7ec2e3498f8734282c6c3d4b07b346b8"}, + {file = "charset_normalizer-3.4.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dd78cfcda14a1ef52584dbb008f7ac81c1328c0f58184bf9a84c49c605002da6"}, + {file = "charset_normalizer-3.4.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6e27f48bcd0957c6d4cb9d6fa6b61d192d0b13d5ef563e5f2ae35feafc0d179c"}, + {file = "charset_normalizer-3.4.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:01ad647cdd609225c5350561d084b42ddf732f4eeefe6e678765636791e78b9a"}, + {file = "charset_normalizer-3.4.1-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:619a609aa74ae43d90ed2e89bdd784765de0a25ca761b93e196d938b8fd1dbbd"}, + {file = "charset_normalizer-3.4.1-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:89149166622f4db9b4b6a449256291dc87a99ee53151c74cbd82a53c8c2f6ccd"}, + {file = "charset_normalizer-3.4.1-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:7709f51f5f7c853f0fb938bcd3bc59cdfdc5203635ffd18bf354f6967ea0f824"}, + {file = "charset_normalizer-3.4.1-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:345b0426edd4e18138d6528aed636de7a9ed169b4aaf9d61a8c19e39d26838ca"}, + {file = "charset_normalizer-3.4.1-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:0907f11d019260cdc3f94fbdb23ff9125f6b5d1039b76003b5b0ac9d6a6c9d5b"}, + {file = "charset_normalizer-3.4.1-cp38-cp38-win32.whl", hash = "sha256:ea0d8d539afa5eb2728aa1932a988a9a7af94f18582ffae4bc10b3fbdad0626e"}, + {file = "charset_normalizer-3.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:329ce159e82018d646c7ac45b01a430369d526569ec08516081727a20e9e4af4"}, + {file = "charset_normalizer-3.4.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:b97e690a2118911e39b4042088092771b4ae3fc3aa86518f84b8cf6888dbdb41"}, + {file = "charset_normalizer-3.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:78baa6d91634dfb69ec52a463534bc0df05dbd546209b79a3880a34487f4b84f"}, + {file = "charset_normalizer-3.4.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1a2bc9f351a75ef49d664206d51f8e5ede9da246602dc2d2726837620ea034b2"}, + {file = "charset_normalizer-3.4.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:75832c08354f595c760a804588b9357d34ec00ba1c940c15e31e96d902093770"}, + {file = "charset_normalizer-3.4.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0af291f4fe114be0280cdd29d533696a77b5b49cfde5467176ecab32353395c4"}, + {file = "charset_normalizer-3.4.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0167ddc8ab6508fe81860a57dd472b2ef4060e8d378f0cc555707126830f2537"}, + {file = "charset_normalizer-3.4.1-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:2a75d49014d118e4198bcee5ee0a6f25856b29b12dbf7cd012791f8a6cc5c496"}, + {file = "charset_normalizer-3.4.1-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:363e2f92b0f0174b2f8238240a1a30142e3db7b957a5dd5689b0e75fb717cc78"}, + {file = "charset_normalizer-3.4.1-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:ab36c8eb7e454e34e60eb55ca5d241a5d18b2c6244f6827a30e451c42410b5f7"}, + {file = "charset_normalizer-3.4.1-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:4c0907b1928a36d5a998d72d64d8eaa7244989f7aaaf947500d3a800c83a3fd6"}, + {file = "charset_normalizer-3.4.1-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:04432ad9479fa40ec0f387795ddad4437a2b50417c69fa275e212933519ff294"}, + {file = "charset_normalizer-3.4.1-cp39-cp39-win32.whl", hash = "sha256:3bed14e9c89dcb10e8f3a29f9ccac4955aebe93c71ae803af79265c9ca5644c5"}, + {file = "charset_normalizer-3.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:49402233c892a461407c512a19435d1ce275543138294f7ef013f0b63d5d3765"}, + {file = "charset_normalizer-3.4.1-py3-none-any.whl", hash = "sha256:d98b1668f06378c6dbefec3b92299716b931cd4e6061f3c875a71ced1780ab85"}, + {file = "charset_normalizer-3.4.1.tar.gz", hash = "sha256:44251f18cd68a75b56585dd00dae26183e102cd5e0f9f1466e6df5da2ed64ea3"}, ] [[package]] name = "click" -version = "8.1.7" +version = "8.1.8" description = "Composable command line interface toolkit" optional = true python-versions = ">=3.7" files = [ - {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"}, - {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"}, + {file = "click-8.1.8-py3-none-any.whl", hash = "sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2"}, + {file = "click-8.1.8.tar.gz", hash = "sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a"}, ] [package.dependencies] @@ -933,13 +921,13 @@ files = [ [[package]] name = "fsspec" -version = "2024.10.0" +version = "2024.12.0" description = "File-system specification" optional = true python-versions = ">=3.8" files = [ - {file = "fsspec-2024.10.0-py3-none-any.whl", hash = "sha256:03b9a6785766a4de40368b88906366755e2819e758b83705c88cd7cb5fe81871"}, - {file = "fsspec-2024.10.0.tar.gz", hash = "sha256:eda2d8a4116d4f2429db8550f2457da57279247dd930bb12f821b58391359493"}, + {file = "fsspec-2024.12.0-py3-none-any.whl", hash = "sha256:b520aed47ad9804237ff878b504267a3b0b441e97508bd6d2d8774e3db85cee2"}, + {file = "fsspec-2024.12.0.tar.gz", hash = "sha256:670700c977ed2fb51e0d9f9253177ed20cbde4a3e5c0283cc5385b5870c8533f"}, ] [package.extras] @@ -1024,13 +1012,13 @@ grpcio-gcp = ["grpcio-gcp (>=0.2.2,<1.0.dev0)"] [[package]] name = "google-api-python-client" -version = "2.155.0" +version = "2.158.0" description = "Google API Client Library for Python" optional = true python-versions = ">=3.7" files = [ - {file = "google_api_python_client-2.155.0-py2.py3-none-any.whl", hash = "sha256:83fe9b5aa4160899079d7c93a37be306546a17e6686e2549bcc9584f1a229747"}, - {file = "google_api_python_client-2.155.0.tar.gz", hash = "sha256:25529f89f0d13abcf3c05c089c423fb2858ac16e0b3727543393468d0d7af67c"}, + {file = "google_api_python_client-2.158.0-py2.py3-none-any.whl", hash = "sha256:36f8c8d2e79e50f76790ca5946d2f3f8333e210dc8539a6c88e0742416474ad2"}, + {file = "google_api_python_client-2.158.0.tar.gz", hash = "sha256:b6664597a9955e04977a62752e33fe44cb35c580e190c1cb08a041893172bd67"}, ] [package.dependencies] @@ -1319,13 +1307,13 @@ grpc = ["grpcio (>=1.44.0,<2.0.0.dev0)"] [[package]] name = "grpc-google-iam-v1" -version = "0.13.1" +version = "0.14.0" description = "IAM API client library" optional = true python-versions = ">=3.7" files = [ - {file = "grpc-google-iam-v1-0.13.1.tar.gz", hash = "sha256:3ff4b2fd9d990965e410965253c0da6f66205d5a8291c4c31c6ebecca18a9001"}, - {file = "grpc_google_iam_v1-0.13.1-py2.py3-none-any.whl", hash = "sha256:c3e86151a981811f30d5e7330f271cee53e73bb87755e88cc3b6f0c7b5fe374e"}, + {file = "grpc_google_iam_v1-0.14.0-py2.py3-none-any.whl", hash = "sha256:fb4a084b30099ba3ab07d61d620a0d4429570b13ff53bd37bac75235f98b7da4"}, + {file = "grpc_google_iam_v1-0.14.0.tar.gz", hash = "sha256:c66e07aa642e39bb37950f9e7f491f70dad150ac9801263b42b2814307c2df99"}, ] [package.dependencies] @@ -1335,85 +1323,85 @@ protobuf = ">=3.20.2,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4 [[package]] name = "grpcio" -version = "1.68.1" +version = "1.69.0" description = "HTTP/2-based RPC framework" optional = true python-versions = ">=3.8" files = [ - {file = "grpcio-1.68.1-cp310-cp310-linux_armv7l.whl", hash = "sha256:d35740e3f45f60f3c37b1e6f2f4702c23867b9ce21c6410254c9c682237da68d"}, - {file = "grpcio-1.68.1-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:d99abcd61760ebb34bdff37e5a3ba333c5cc09feda8c1ad42547bea0416ada78"}, - {file = "grpcio-1.68.1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:f8261fa2a5f679abeb2a0a93ad056d765cdca1c47745eda3f2d87f874ff4b8c9"}, - {file = "grpcio-1.68.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0feb02205a27caca128627bd1df4ee7212db051019a9afa76f4bb6a1a80ca95e"}, - {file = "grpcio-1.68.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:919d7f18f63bcad3a0f81146188e90274fde800a94e35d42ffe9eadf6a9a6330"}, - {file = "grpcio-1.68.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:963cc8d7d79b12c56008aabd8b457f400952dbea8997dd185f155e2f228db079"}, - {file = "grpcio-1.68.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ccf2ebd2de2d6661e2520dae293298a3803a98ebfc099275f113ce1f6c2a80f1"}, - {file = "grpcio-1.68.1-cp310-cp310-win32.whl", hash = "sha256:2cc1fd04af8399971bcd4f43bd98c22d01029ea2e56e69c34daf2bf8470e47f5"}, - {file = "grpcio-1.68.1-cp310-cp310-win_amd64.whl", hash = "sha256:ee2e743e51cb964b4975de572aa8fb95b633f496f9fcb5e257893df3be854746"}, - {file = "grpcio-1.68.1-cp311-cp311-linux_armv7l.whl", hash = "sha256:55857c71641064f01ff0541a1776bfe04a59db5558e82897d35a7793e525774c"}, - {file = "grpcio-1.68.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:4b177f5547f1b995826ef529d2eef89cca2f830dd8b2c99ffd5fde4da734ba73"}, - {file = "grpcio-1.68.1-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:3522c77d7e6606d6665ec8d50e867f13f946a4e00c7df46768f1c85089eae515"}, - {file = "grpcio-1.68.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9d1fae6bbf0816415b81db1e82fb3bf56f7857273c84dcbe68cbe046e58e1ccd"}, - {file = "grpcio-1.68.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:298ee7f80e26f9483f0b6f94cc0a046caf54400a11b644713bb5b3d8eb387600"}, - {file = "grpcio-1.68.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:cbb5780e2e740b6b4f2d208e90453591036ff80c02cc605fea1af8e6fc6b1bbe"}, - {file = "grpcio-1.68.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ddda1aa22495d8acd9dfbafff2866438d12faec4d024ebc2e656784d96328ad0"}, - {file = "grpcio-1.68.1-cp311-cp311-win32.whl", hash = "sha256:b33bd114fa5a83f03ec6b7b262ef9f5cac549d4126f1dc702078767b10c46ed9"}, - {file = "grpcio-1.68.1-cp311-cp311-win_amd64.whl", hash = "sha256:7f20ebec257af55694d8f993e162ddf0d36bd82d4e57f74b31c67b3c6d63d8b2"}, - {file = "grpcio-1.68.1-cp312-cp312-linux_armv7l.whl", hash = "sha256:8829924fffb25386995a31998ccbbeaa7367223e647e0122043dfc485a87c666"}, - {file = "grpcio-1.68.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:3aed6544e4d523cd6b3119b0916cef3d15ef2da51e088211e4d1eb91a6c7f4f1"}, - {file = "grpcio-1.68.1-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:4efac5481c696d5cb124ff1c119a78bddbfdd13fc499e3bc0ca81e95fc573684"}, - {file = "grpcio-1.68.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6ab2d912ca39c51f46baf2a0d92aa265aa96b2443266fc50d234fa88bf877d8e"}, - {file = "grpcio-1.68.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95c87ce2a97434dffe7327a4071839ab8e8bffd0054cc74cbe971fba98aedd60"}, - {file = "grpcio-1.68.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:e4842e4872ae4ae0f5497bf60a0498fa778c192cc7a9e87877abd2814aca9475"}, - {file = "grpcio-1.68.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:255b1635b0ed81e9f91da4fcc8d43b7ea5520090b9a9ad9340d147066d1d3613"}, - {file = "grpcio-1.68.1-cp312-cp312-win32.whl", hash = "sha256:7dfc914cc31c906297b30463dde0b9be48e36939575eaf2a0a22a8096e69afe5"}, - {file = "grpcio-1.68.1-cp312-cp312-win_amd64.whl", hash = "sha256:a0c8ddabef9c8f41617f213e527254c41e8b96ea9d387c632af878d05db9229c"}, - {file = "grpcio-1.68.1-cp313-cp313-linux_armv7l.whl", hash = "sha256:a47faedc9ea2e7a3b6569795c040aae5895a19dde0c728a48d3c5d7995fda385"}, - {file = "grpcio-1.68.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:390eee4225a661c5cd133c09f5da1ee3c84498dc265fd292a6912b65c421c78c"}, - {file = "grpcio-1.68.1-cp313-cp313-manylinux_2_17_aarch64.whl", hash = "sha256:66a24f3d45c33550703f0abb8b656515b0ab777970fa275693a2f6dc8e35f1c1"}, - {file = "grpcio-1.68.1-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c08079b4934b0bf0a8847f42c197b1d12cba6495a3d43febd7e99ecd1cdc8d54"}, - {file = "grpcio-1.68.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8720c25cd9ac25dd04ee02b69256d0ce35bf8a0f29e20577427355272230965a"}, - {file = "grpcio-1.68.1-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:04cfd68bf4f38f5bb959ee2361a7546916bd9a50f78617a346b3aeb2b42e2161"}, - {file = "grpcio-1.68.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:c28848761a6520c5c6071d2904a18d339a796ebe6b800adc8b3f474c5ce3c3ad"}, - {file = "grpcio-1.68.1-cp313-cp313-win32.whl", hash = "sha256:77d65165fc35cff6e954e7fd4229e05ec76102d4406d4576528d3a3635fc6172"}, - {file = "grpcio-1.68.1-cp313-cp313-win_amd64.whl", hash = "sha256:a8040f85dcb9830d8bbb033ae66d272614cec6faceee88d37a88a9bd1a7a704e"}, - {file = "grpcio-1.68.1-cp38-cp38-linux_armv7l.whl", hash = "sha256:eeb38ff04ab6e5756a2aef6ad8d94e89bb4a51ef96e20f45c44ba190fa0bcaad"}, - {file = "grpcio-1.68.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:8a3869a6661ec8f81d93f4597da50336718bde9eb13267a699ac7e0a1d6d0bea"}, - {file = "grpcio-1.68.1-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:2c4cec6177bf325eb6faa6bd834d2ff6aa8bb3b29012cceb4937b86f8b74323c"}, - {file = "grpcio-1.68.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:12941d533f3cd45d46f202e3667be8ebf6bcb3573629c7ec12c3e211d99cfccf"}, - {file = "grpcio-1.68.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:80af6f1e69c5e68a2be529990684abdd31ed6622e988bf18850075c81bb1ad6e"}, - {file = "grpcio-1.68.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:e8dbe3e00771bfe3d04feed8210fc6617006d06d9a2679b74605b9fed3e8362c"}, - {file = "grpcio-1.68.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:83bbf5807dc3ee94ce1de2dfe8a356e1d74101e4b9d7aa8c720cc4818a34aded"}, - {file = "grpcio-1.68.1-cp38-cp38-win32.whl", hash = "sha256:8cb620037a2fd9eeee97b4531880e439ebfcd6d7d78f2e7dcc3726428ab5ef63"}, - {file = "grpcio-1.68.1-cp38-cp38-win_amd64.whl", hash = "sha256:52fbf85aa71263380d330f4fce9f013c0798242e31ede05fcee7fbe40ccfc20d"}, - {file = "grpcio-1.68.1-cp39-cp39-linux_armv7l.whl", hash = "sha256:cb400138e73969eb5e0535d1d06cae6a6f7a15f2cc74add320e2130b8179211a"}, - {file = "grpcio-1.68.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:a1b988b40f2fd9de5c820f3a701a43339d8dcf2cb2f1ca137e2c02671cc83ac1"}, - {file = "grpcio-1.68.1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:96f473cdacfdd506008a5d7579c9f6a7ff245a9ade92c3c0265eb76cc591914f"}, - {file = "grpcio-1.68.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:37ea3be171f3cf3e7b7e412a98b77685eba9d4fd67421f4a34686a63a65d99f9"}, - {file = "grpcio-1.68.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ceb56c4285754e33bb3c2fa777d055e96e6932351a3082ce3559be47f8024f0"}, - {file = "grpcio-1.68.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:dffd29a2961f3263a16d73945b57cd44a8fd0b235740cb14056f0612329b345e"}, - {file = "grpcio-1.68.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:025f790c056815b3bf53da850dd70ebb849fd755a4b1ac822cb65cd631e37d43"}, - {file = "grpcio-1.68.1-cp39-cp39-win32.whl", hash = "sha256:1098f03dedc3b9810810568060dea4ac0822b4062f537b0f53aa015269be0a76"}, - {file = "grpcio-1.68.1-cp39-cp39-win_amd64.whl", hash = "sha256:334ab917792904245a028f10e803fcd5b6f36a7b2173a820c0b5b076555825e1"}, - {file = "grpcio-1.68.1.tar.gz", hash = "sha256:44a8502dd5de653ae6a73e2de50a401d84184f0331d0ac3daeb044e66d5c5054"}, + {file = "grpcio-1.69.0-cp310-cp310-linux_armv7l.whl", hash = "sha256:2060ca95a8db295ae828d0fc1c7f38fb26ccd5edf9aa51a0f44251f5da332e97"}, + {file = "grpcio-1.69.0-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:2e52e107261fd8fa8fa457fe44bfadb904ae869d87c1280bf60f93ecd3e79278"}, + {file = "grpcio-1.69.0-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:316463c0832d5fcdb5e35ff2826d9aa3f26758d29cdfb59a368c1d6c39615a11"}, + {file = "grpcio-1.69.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:26c9a9c4ac917efab4704b18eed9082ed3b6ad19595f047e8173b5182fec0d5e"}, + {file = "grpcio-1.69.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90b3646ced2eae3a0599658eeccc5ba7f303bf51b82514c50715bdd2b109e5ec"}, + {file = "grpcio-1.69.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3b75aea7c6cb91b341c85e7c1d9db1e09e1dd630b0717f836be94971e015031e"}, + {file = "grpcio-1.69.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5cfd14175f9db33d4b74d63de87c64bb0ee29ce475ce3c00c01ad2a3dc2a9e51"}, + {file = "grpcio-1.69.0-cp310-cp310-win32.whl", hash = "sha256:9031069d36cb949205293cf0e243abd5e64d6c93e01b078c37921493a41b72dc"}, + {file = "grpcio-1.69.0-cp310-cp310-win_amd64.whl", hash = "sha256:cc89b6c29f3dccbe12d7a3b3f1b3999db4882ae076c1c1f6df231d55dbd767a5"}, + {file = "grpcio-1.69.0-cp311-cp311-linux_armv7l.whl", hash = "sha256:8de1b192c29b8ce45ee26a700044717bcbbd21c697fa1124d440548964328561"}, + {file = "grpcio-1.69.0-cp311-cp311-macosx_10_14_universal2.whl", hash = "sha256:7e76accf38808f5c5c752b0ab3fd919eb14ff8fafb8db520ad1cc12afff74de6"}, + {file = "grpcio-1.69.0-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:d5658c3c2660417d82db51e168b277e0ff036d0b0f859fa7576c0ffd2aec1442"}, + {file = "grpcio-1.69.0-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5494d0e52bf77a2f7eb17c6da662886ca0a731e56c1c85b93505bece8dc6cf4c"}, + {file = "grpcio-1.69.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4ed866f9edb574fd9be71bf64c954ce1b88fc93b2a4cbf94af221e9426eb14d6"}, + {file = "grpcio-1.69.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:c5ba38aeac7a2fe353615c6b4213d1fbb3a3c34f86b4aaa8be08baaaee8cc56d"}, + {file = "grpcio-1.69.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f79e05f5bbf551c4057c227d1b041ace0e78462ac8128e2ad39ec58a382536d2"}, + {file = "grpcio-1.69.0-cp311-cp311-win32.whl", hash = "sha256:bf1f8be0da3fcdb2c1e9f374f3c2d043d606d69f425cd685110dd6d0d2d61258"}, + {file = "grpcio-1.69.0-cp311-cp311-win_amd64.whl", hash = "sha256:fb9302afc3a0e4ba0b225cd651ef8e478bf0070cf11a529175caecd5ea2474e7"}, + {file = "grpcio-1.69.0-cp312-cp312-linux_armv7l.whl", hash = "sha256:fc18a4de8c33491ad6f70022af5c460b39611e39578a4d84de0fe92f12d5d47b"}, + {file = "grpcio-1.69.0-cp312-cp312-macosx_10_14_universal2.whl", hash = "sha256:0f0270bd9ffbff6961fe1da487bdcd594407ad390cc7960e738725d4807b18c4"}, + {file = "grpcio-1.69.0-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:dc48f99cc05e0698e689b51a05933253c69a8c8559a47f605cff83801b03af0e"}, + {file = "grpcio-1.69.0-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e925954b18d41aeb5ae250262116d0970893b38232689c4240024e4333ac084"}, + {file = "grpcio-1.69.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:87d222569273720366f68a99cb62e6194681eb763ee1d3b1005840678d4884f9"}, + {file = "grpcio-1.69.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:b62b0f41e6e01a3e5082000b612064c87c93a49b05f7602fe1b7aa9fd5171a1d"}, + {file = "grpcio-1.69.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:db6f9fd2578dbe37db4b2994c94a1d9c93552ed77dca80e1657bb8a05b898b55"}, + {file = "grpcio-1.69.0-cp312-cp312-win32.whl", hash = "sha256:b192b81076073ed46f4b4dd612b8897d9a1e39d4eabd822e5da7b38497ed77e1"}, + {file = "grpcio-1.69.0-cp312-cp312-win_amd64.whl", hash = "sha256:1227ff7836f7b3a4ab04e5754f1d001fa52a730685d3dc894ed8bc262cc96c01"}, + {file = "grpcio-1.69.0-cp313-cp313-linux_armv7l.whl", hash = "sha256:a78a06911d4081a24a1761d16215a08e9b6d4d29cdbb7e427e6c7e17b06bcc5d"}, + {file = "grpcio-1.69.0-cp313-cp313-macosx_10_14_universal2.whl", hash = "sha256:dc5a351927d605b2721cbb46158e431dd49ce66ffbacb03e709dc07a491dde35"}, + {file = "grpcio-1.69.0-cp313-cp313-manylinux_2_17_aarch64.whl", hash = "sha256:3629d8a8185f5139869a6a17865d03113a260e311e78fbe313f1a71603617589"}, + {file = "grpcio-1.69.0-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c9a281878feeb9ae26db0622a19add03922a028d4db684658f16d546601a4870"}, + {file = "grpcio-1.69.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8cc614e895177ab7e4b70f154d1a7c97e152577ea101d76026d132b7aaba003b"}, + {file = "grpcio-1.69.0-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:1ee76cd7e2e49cf9264f6812d8c9ac1b85dda0eaea063af07292400f9191750e"}, + {file = "grpcio-1.69.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:0470fa911c503af59ec8bc4c82b371ee4303ececbbdc055f55ce48e38b20fd67"}, + {file = "grpcio-1.69.0-cp313-cp313-win32.whl", hash = "sha256:b650f34aceac8b2d08a4c8d7dc3e8a593f4d9e26d86751ebf74ebf5107d927de"}, + {file = "grpcio-1.69.0-cp313-cp313-win_amd64.whl", hash = "sha256:028337786f11fecb5d7b7fa660475a06aabf7e5e52b5ac2df47414878c0ce7ea"}, + {file = "grpcio-1.69.0-cp38-cp38-linux_armv7l.whl", hash = "sha256:b7f693db593d6bf285e015d5538bf1c86cf9c60ed30b6f7da04a00ed052fe2f3"}, + {file = "grpcio-1.69.0-cp38-cp38-macosx_10_14_universal2.whl", hash = "sha256:8b94e83f66dbf6fd642415faca0608590bc5e8d30e2c012b31d7d1b91b1de2fd"}, + {file = "grpcio-1.69.0-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:b634851b92c090763dde61df0868c730376cdb73a91bcc821af56ae043b09596"}, + {file = "grpcio-1.69.0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bf5f680d3ed08c15330d7830d06bc65f58ca40c9999309517fd62880d70cb06e"}, + {file = "grpcio-1.69.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:200e48a6e7b00f804cf00a1c26292a5baa96507c7749e70a3ec10ca1a288936e"}, + {file = "grpcio-1.69.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:45a4704339b6e5b24b0e136dea9ad3815a94f30eb4f1e1d44c4ac484ef11d8dd"}, + {file = "grpcio-1.69.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:85d347cb8237751b23539981dbd2d9d8f6e9ff90082b427b13022b948eb6347a"}, + {file = "grpcio-1.69.0-cp38-cp38-win32.whl", hash = "sha256:60e5de105dc02832dc8f120056306d0ef80932bcf1c0e2b4ca3b676de6dc6505"}, + {file = "grpcio-1.69.0-cp38-cp38-win_amd64.whl", hash = "sha256:282f47d0928e40f25d007f24eb8fa051cb22551e3c74b8248bc9f9bea9c35fe0"}, + {file = "grpcio-1.69.0-cp39-cp39-linux_armv7l.whl", hash = "sha256:dd034d68a2905464c49479b0c209c773737a4245d616234c79c975c7c90eca03"}, + {file = "grpcio-1.69.0-cp39-cp39-macosx_10_14_universal2.whl", hash = "sha256:01f834732c22a130bdf3dc154d1053bdbc887eb3ccb7f3e6285cfbfc33d9d5cc"}, + {file = "grpcio-1.69.0-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:a7f4ed0dcf202a70fe661329f8874bc3775c14bb3911d020d07c82c766ce0eb1"}, + {file = "grpcio-1.69.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cd7ea241b10bc5f0bb0f82c0d7896822b7ed122b3ab35c9851b440c1ccf81588"}, + {file = "grpcio-1.69.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1f03dc9b4da4c0dc8a1db7a5420f575251d7319b7a839004d8916257ddbe4816"}, + {file = "grpcio-1.69.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:ca71d73a270dff052fe4edf74fef142d6ddd1f84175d9ac4a14b7280572ac519"}, + {file = "grpcio-1.69.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5ccbed100dc43704e94ccff9e07680b540d64e4cc89213ab2832b51b4f68a520"}, + {file = "grpcio-1.69.0-cp39-cp39-win32.whl", hash = "sha256:1514341def9c6ec4b7f0b9628be95f620f9d4b99331b7ef0a1845fd33d9b579c"}, + {file = "grpcio-1.69.0-cp39-cp39-win_amd64.whl", hash = "sha256:c1fea55d26d647346acb0069b08dca70984101f2dc95066e003019207212e303"}, + {file = "grpcio-1.69.0.tar.gz", hash = "sha256:936fa44241b5379c5afc344e1260d467bee495747eaf478de825bab2791da6f5"}, ] [package.extras] -protobuf = ["grpcio-tools (>=1.68.1)"] +protobuf = ["grpcio-tools (>=1.69.0)"] [[package]] name = "grpcio-status" -version = "1.68.1" +version = "1.69.0" description = "Status proto mapping for gRPC" optional = true python-versions = ">=3.8" files = [ - {file = "grpcio_status-1.68.1-py3-none-any.whl", hash = "sha256:66f3d8847f665acfd56221333d66f7ad8927903d87242a482996bdb45e8d28fd"}, - {file = "grpcio_status-1.68.1.tar.gz", hash = "sha256:e1378d036c81a1610d7b4c7a146cd663dd13fcc915cf4d7d053929dba5bbb6e1"}, + {file = "grpcio_status-1.69.0-py3-none-any.whl", hash = "sha256:d6b2a3c9562c03a817c628d7ba9a925e209c228762d6d7677ae5c9401a542853"}, + {file = "grpcio_status-1.69.0.tar.gz", hash = "sha256:595ef84e5178d6281caa732ccf68ff83259241608d26b0e9c40a5e66eee2a2d2"}, ] [package.dependencies] googleapis-common-protos = ">=1.5.5" -grpcio = ">=1.68.1" +grpcio = ">=1.69.0" protobuf = ">=5.26.1,<6.0dev" [[package]] @@ -1489,13 +1477,13 @@ zstd = ["zstandard (>=0.18.0)"] [[package]] name = "huggingface-hub" -version = "0.27.0" +version = "0.27.1" description = "Client library to download and publish models, datasets and other repos on the huggingface.co hub" optional = true python-versions = ">=3.8.0" files = [ - {file = "huggingface_hub-0.27.0-py3-none-any.whl", hash = "sha256:8f2e834517f1f1ddf1ecc716f91b120d7333011b7485f665a9a412eacb1a2a81"}, - {file = "huggingface_hub-0.27.0.tar.gz", hash = "sha256:902cce1a1be5739f5589e560198a65a8edcfd3b830b1666f36e4b961f0454fac"}, + {file = "huggingface_hub-0.27.1-py3-none-any.whl", hash = "sha256:1c5155ca7d60b60c2e2fc38cbb3ffb7f7c3adf48f824015b219af9061771daec"}, + {file = "huggingface_hub-0.27.1.tar.gz", hash = "sha256:c004463ca870283909d715d20f066ebd6968c2207dae9393fdffb3c1d4d8f98b"}, ] [package.dependencies] @@ -1706,13 +1694,13 @@ testing = ["Django", "attrs", "colorama", "docopt", "pytest (<9.0.0)"] [[package]] name = "jinja2" -version = "3.1.4" +version = "3.1.5" description = "A very fast and expressive template engine." optional = false python-versions = ">=3.7" files = [ - {file = "jinja2-3.1.4-py3-none-any.whl", hash = "sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d"}, - {file = "jinja2-3.1.4.tar.gz", hash = "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369"}, + {file = "jinja2-3.1.5-py3-none-any.whl", hash = "sha256:aba0f4dc9ed8013c424088f68a5c226f7d6097ed89b246d7749c2ec4175c6adb"}, + {file = "jinja2-3.1.5.tar.gz", hash = "sha256:8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb"}, ] [package.dependencies] @@ -2002,13 +1990,13 @@ jupyter-server = ">=1.1.2" [[package]] name = "jupyter-server" -version = "2.14.2" +version = "2.15.0" description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications." optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "jupyter_server-2.14.2-py3-none-any.whl", hash = "sha256:47ff506127c2f7851a17bf4713434208fc490955d0e8632e95014a9a9afbeefd"}, - {file = "jupyter_server-2.14.2.tar.gz", hash = "sha256:66095021aa9638ced276c248b1d81862e4c50f292d575920bbe960de1c56b12b"}, + {file = "jupyter_server-2.15.0-py3-none-any.whl", hash = "sha256:872d989becf83517012ee669f09604aa4a28097c0bd90b2f424310156c2cdae3"}, + {file = "jupyter_server-2.15.0.tar.gz", hash = "sha256:9d446b8697b4f7337a1b7cdcac40778babdd93ba614b6d68ab1c0c918f1c4084"}, ] [package.dependencies] @@ -2017,7 +2005,7 @@ argon2-cffi = ">=21.1" jinja2 = ">=3.0.3" jupyter-client = ">=7.4.4" jupyter-core = ">=4.12,<5.0.dev0 || >=5.1.dev0" -jupyter-events = ">=0.9.0" +jupyter-events = ">=0.11.0" jupyter-server-terminals = ">=0.4.4" nbconvert = ">=6.4.4" nbformat = ">=5.3.0" @@ -2057,13 +2045,13 @@ test = ["jupyter-server (>=2.0.0)", "pytest (>=7.0)", "pytest-jupyter[server] (> [[package]] name = "jupyterlab" -version = "4.3.3" +version = "4.3.4" description = "JupyterLab computational environment" optional = false python-versions = ">=3.8" files = [ - {file = "jupyterlab-4.3.3-py3-none-any.whl", hash = "sha256:32a8fd30677e734ffcc3916a4758b9dab21b02015b668c60eb36f84357b7d4b1"}, - {file = "jupyterlab-4.3.3.tar.gz", hash = "sha256:76fa39e548fdac94dc1204af5956c556f54c785f70ee26aa47ea08eda4d5bbcd"}, + {file = "jupyterlab-4.3.4-py3-none-any.whl", hash = "sha256:b754c2601c5be6adf87cb5a1d8495d653ffb945f021939f77776acaa94dae952"}, + {file = "jupyterlab-4.3.4.tar.gz", hash = "sha256:f0bb9b09a04766e3423cccc2fc23169aa2ffedcdf8713e9e0fb33cac0b6859d0"}, ] [package.dependencies] @@ -2140,13 +2128,13 @@ files = [ [[package]] name = "litellm" -version = "1.55.3" +version = "1.57.8" description = "Library to easily interface with LLM API providers" optional = true python-versions = "!=2.7.*,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,!=3.7.*,>=3.8" files = [ - {file = "litellm-1.55.3-py3-none-any.whl", hash = "sha256:83e48a6104f2b30edb62f708ca47dfd42f22416ed2ab34702770b3a57d866aa5"}, - {file = "litellm-1.55.3.tar.gz", hash = "sha256:83f7fd5c7b6eec1d431e786be9d73fbb72f1f1bc9aff333169a4a8eb61e72018"}, + {file = "litellm-1.57.8-py3-none-any.whl", hash = "sha256:d0ed4a47ff0abf194abd236c375699b4fb16e33829d4a3aa7e9bbedf26440956"}, + {file = "litellm-1.57.8.tar.gz", hash = "sha256:e3550f7e43c789aaf0f56a98d683e7e376178dd5626b80e4a3bac4c411e47ecb"}, ] [package.dependencies] @@ -2159,13 +2147,12 @@ jsonschema = ">=4.22.0,<5.0.0" openai = ">=1.55.3" pydantic = ">=2.0.0,<3.0.0" python-dotenv = ">=0.2.0" -requests = ">=2.31.0,<3.0.0" tiktoken = ">=0.7.0" tokenizers = "*" [package.extras] extra-proxy = ["azure-identity (>=1.15.0,<2.0.0)", "azure-keyvault-secrets (>=4.8.0,<5.0.0)", "google-cloud-kms (>=2.21.3,<3.0.0)", "prisma (==0.11.0)", "resend (>=0.8.0,<0.9.0)"] -proxy = ["PyJWT (>=2.8.0,<3.0.0)", "apscheduler (>=3.10.4,<4.0.0)", "backoff", "cryptography (>=42.0.5,<43.0.0)", "fastapi (>=0.111.0,<0.112.0)", "fastapi-sso (>=0.10.0,<0.11.0)", "gunicorn (>=22.0.0,<23.0.0)", "orjson (>=3.9.7,<4.0.0)", "pynacl (>=1.5.0,<2.0.0)", "python-multipart (>=0.0.9,<0.0.10)", "pyyaml (>=6.0.1,<7.0.0)", "rq", "uvicorn (>=0.22.0,<0.23.0)"] +proxy = ["PyJWT (>=2.8.0,<3.0.0)", "apscheduler (>=3.10.4,<4.0.0)", "backoff", "cryptography (>=43.0.1,<44.0.0)", "fastapi (>=0.115.5,<0.116.0)", "fastapi-sso (>=0.16.0,<0.17.0)", "gunicorn (>=22.0.0,<23.0.0)", "orjson (>=3.9.7,<4.0.0)", "pynacl (>=1.5.0,<2.0.0)", "python-multipart (>=0.0.18,<0.0.19)", "pyyaml (>=6.0.1,<7.0.0)", "rq", "uvicorn (>=0.22.0,<0.23.0)", "uvloop (>=0.21.0,<0.22.0)"] [[package]] name = "markupsafe" @@ -2253,15 +2240,18 @@ traitlets = "*" [[package]] name = "mistune" -version = "3.0.2" +version = "3.1.0" description = "A sane and fast Markdown parser with useful plugins and renderers" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "mistune-3.0.2-py3-none-any.whl", hash = "sha256:71481854c30fdbc938963d3605b72501f5c10a9320ecd412c121c163a1c7d205"}, - {file = "mistune-3.0.2.tar.gz", hash = "sha256:fc7f93ded930c92394ef2cb6f04a8aabab4117a91449e72dcc8dfa646a508be8"}, + {file = "mistune-3.1.0-py3-none-any.whl", hash = "sha256:b05198cf6d671b3deba6c87ec6cf0d4eb7b72c524636eddb6dbf13823b52cee1"}, + {file = "mistune-3.1.0.tar.gz", hash = "sha256:dbcac2f78292b9dc066cd03b7a3a26b62d85f8159f2ea5fd28e55df79908d667"}, ] +[package.dependencies] +typing-extensions = {version = "*", markers = "python_version < \"3.11\""} + [[package]] name = "multidict" version = "6.1.0" @@ -2368,13 +2358,13 @@ typing-extensions = {version = ">=4.1.0", markers = "python_version < \"3.11\""} [[package]] name = "nbclient" -version = "0.10.1" +version = "0.10.2" description = "A client library for executing notebooks. Formerly nbconvert's ExecutePreprocessor." optional = false -python-versions = ">=3.8.0" +python-versions = ">=3.9.0" files = [ - {file = "nbclient-0.10.1-py3-none-any.whl", hash = "sha256:949019b9240d66897e442888cfb618f69ef23dc71c01cb5fced8499c2cfc084d"}, - {file = "nbclient-0.10.1.tar.gz", hash = "sha256:3e93e348ab27e712acd46fccd809139e356eb9a31aab641d1a7991a6eb4e6f68"}, + {file = "nbclient-0.10.2-py3-none-any.whl", hash = "sha256:4ffee11e788b4a27fabeb7955547e4318a5298f34342a4bfd01f2e1faaeadc3d"}, + {file = "nbclient-0.10.2.tar.gz", hash = "sha256:90b7fc6b810630db87a6d0c2250b1f0ab4cf4d3c27a299b0cde78a4ed3fd9193"}, ] [package.dependencies] @@ -2385,23 +2375,23 @@ traitlets = ">=5.4" [package.extras] dev = ["pre-commit"] -docs = ["autodoc-traits", "flaky", "ipykernel (>=6.19.3)", "ipython", "ipywidgets", "mock", "moto", "myst-parser", "nbconvert (>=7.0.0)", "pytest (>=7.0,<8)", "pytest-asyncio", "pytest-cov (>=4.0)", "sphinx (>=1.7)", "sphinx-book-theme", "sphinxcontrib-spelling", "testpath", "xmltodict"] -test = ["flaky", "ipykernel (>=6.19.3)", "ipython", "ipywidgets", "nbconvert (>=7.0.0)", "pytest (>=7.0,<8)", "pytest-asyncio", "pytest-cov (>=4.0)", "testpath", "xmltodict"] +docs = ["autodoc-traits", "flaky", "ipykernel (>=6.19.3)", "ipython", "ipywidgets", "mock", "moto", "myst-parser", "nbconvert (>=7.1.0)", "pytest (>=7.0,<8)", "pytest-asyncio", "pytest-cov (>=4.0)", "sphinx (>=1.7)", "sphinx-book-theme", "sphinxcontrib-spelling", "testpath", "xmltodict"] +test = ["flaky", "ipykernel (>=6.19.3)", "ipython", "ipywidgets", "nbconvert (>=7.1.0)", "pytest (>=7.0,<8)", "pytest-asyncio", "pytest-cov (>=4.0)", "testpath", "xmltodict"] [[package]] name = "nbconvert" -version = "7.16.4" +version = "7.16.5" description = "Converting Jupyter Notebooks (.ipynb files) to other formats. Output formats include asciidoc, html, latex, markdown, pdf, py, rst, script. nbconvert can be used both as a Python library (`import nbconvert`) or as a command line tool (invoked as `jupyter nbconvert ...`)." optional = false python-versions = ">=3.8" files = [ - {file = "nbconvert-7.16.4-py3-none-any.whl", hash = "sha256:05873c620fe520b6322bf8a5ad562692343fe3452abda5765c7a34b7d1aa3eb3"}, - {file = "nbconvert-7.16.4.tar.gz", hash = "sha256:86ca91ba266b0a448dc96fa6c5b9d98affabde2867b363258703536807f9f7f4"}, + {file = "nbconvert-7.16.5-py3-none-any.whl", hash = "sha256:e12eac052d6fd03040af4166c563d76e7aeead2e9aadf5356db552a1784bd547"}, + {file = "nbconvert-7.16.5.tar.gz", hash = "sha256:c83467bb5777fdfaac5ebbb8e864f300b277f68692ecc04d6dab72f2d8442344"}, ] [package.dependencies] beautifulsoup4 = "*" -bleach = "!=5.0.0" +bleach = {version = "!=5.0.0", extras = ["css"]} defusedxml = "*" importlib-metadata = {version = ">=3.6", markers = "python_version < \"3.10\""} jinja2 = ">=3.0" @@ -2414,7 +2404,6 @@ nbformat = ">=5.7" packaging = "*" pandocfilters = ">=1.4.1" pygments = ">=2.4.1" -tinycss2 = "*" traitlets = ">=5.1" [package.extras] @@ -2460,18 +2449,18 @@ files = [ [[package]] name = "notebook" -version = "7.3.1" +version = "7.3.2" description = "Jupyter Notebook - A web-based notebook environment for interactive computing" optional = false python-versions = ">=3.8" files = [ - {file = "notebook-7.3.1-py3-none-any.whl", hash = "sha256:212e1486b2230fe22279043f33c7db5cf9a01d29feb063a85cb139747b7c9483"}, - {file = "notebook-7.3.1.tar.gz", hash = "sha256:84381c2a82d867517fd25b86e986dae1fe113a70b98f03edff9b94e499fec8fa"}, + {file = "notebook-7.3.2-py3-none-any.whl", hash = "sha256:e5f85fc59b69d3618d73cf27544418193ff8e8058d5bf61d315ce4f473556288"}, + {file = "notebook-7.3.2.tar.gz", hash = "sha256:705e83a1785f45b383bf3ee13cb76680b92d24f56fb0c7d2136fe1d850cd3ca8"}, ] [package.dependencies] jupyter-server = ">=2.4.0,<3" -jupyterlab = ">=4.3.2,<4.4" +jupyterlab = ">=4.3.4,<4.4" jupyterlab-server = ">=2.27.1,<3" notebook-shim = ">=0.2,<0.3" tornado = ">=6.2.0" @@ -2568,13 +2557,13 @@ httpx = ">=0.27.0,<0.28.0" [[package]] name = "openai" -version = "1.58.1" +version = "1.59.6" description = "The official Python library for the openai API" optional = true python-versions = ">=3.8" files = [ - {file = "openai-1.58.1-py3-none-any.whl", hash = "sha256:e2910b1170a6b7f88ef491ac3a42c387f08bd3db533411f7ee391d166571d63c"}, - {file = "openai-1.58.1.tar.gz", hash = "sha256:f5a035fd01e141fc743f4b0e02c41ca49be8fab0866d3b67f5f29b4f4d3c0973"}, + {file = "openai-1.59.6-py3-none-any.whl", hash = "sha256:b28ed44eee3d5ebe1a3ea045ee1b4b50fea36ecd50741aaa5ce5a5559c900cb6"}, + {file = "openai-1.59.6.tar.gz", hash = "sha256:c7670727c2f1e4473f62fea6fa51475c8bc098c9ffb47bfb9eef5be23c747934"}, ] [package.dependencies] @@ -2908,52 +2897,52 @@ testing = ["google-api-core (>=1.31.5)"] [[package]] name = "protobuf" -version = "5.29.1" +version = "5.29.3" description = "" optional = true python-versions = ">=3.8" files = [ - {file = "protobuf-5.29.1-cp310-abi3-win32.whl", hash = "sha256:22c1f539024241ee545cbcb00ee160ad1877975690b16656ff87dde107b5f110"}, - {file = "protobuf-5.29.1-cp310-abi3-win_amd64.whl", hash = "sha256:1fc55267f086dd4050d18ef839d7bd69300d0d08c2a53ca7df3920cc271a3c34"}, - {file = "protobuf-5.29.1-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:d473655e29c0c4bbf8b69e9a8fb54645bc289dead6d753b952e7aa660254ae18"}, - {file = "protobuf-5.29.1-cp38-abi3-manylinux2014_aarch64.whl", hash = "sha256:b5ba1d0e4c8a40ae0496d0e2ecfdbb82e1776928a205106d14ad6985a09ec155"}, - {file = "protobuf-5.29.1-cp38-abi3-manylinux2014_x86_64.whl", hash = "sha256:8ee1461b3af56145aca2800e6a3e2f928108c749ba8feccc6f5dd0062c410c0d"}, - {file = "protobuf-5.29.1-cp38-cp38-win32.whl", hash = "sha256:50879eb0eb1246e3a5eabbbe566b44b10348939b7cc1b267567e8c3d07213853"}, - {file = "protobuf-5.29.1-cp38-cp38-win_amd64.whl", hash = "sha256:027fbcc48cea65a6b17028510fdd054147057fa78f4772eb547b9274e5219331"}, - {file = "protobuf-5.29.1-cp39-cp39-win32.whl", hash = "sha256:5a41deccfa5e745cef5c65a560c76ec0ed8e70908a67cc8f4da5fce588b50d57"}, - {file = "protobuf-5.29.1-cp39-cp39-win_amd64.whl", hash = "sha256:012ce28d862ff417fd629285aca5d9772807f15ceb1a0dbd15b88f58c776c98c"}, - {file = "protobuf-5.29.1-py3-none-any.whl", hash = "sha256:32600ddb9c2a53dedc25b8581ea0f1fd8ea04956373c0c07577ce58d312522e0"}, - {file = "protobuf-5.29.1.tar.gz", hash = "sha256:683be02ca21a6ffe80db6dd02c0b5b2892322c59ca57fd6c872d652cb80549cb"}, + {file = "protobuf-5.29.3-cp310-abi3-win32.whl", hash = "sha256:3ea51771449e1035f26069c4c7fd51fba990d07bc55ba80701c78f886bf9c888"}, + {file = "protobuf-5.29.3-cp310-abi3-win_amd64.whl", hash = "sha256:a4fa6f80816a9a0678429e84973f2f98cbc218cca434abe8db2ad0bffc98503a"}, + {file = "protobuf-5.29.3-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:a8434404bbf139aa9e1300dbf989667a83d42ddda9153d8ab76e0d5dcaca484e"}, + {file = "protobuf-5.29.3-cp38-abi3-manylinux2014_aarch64.whl", hash = "sha256:daaf63f70f25e8689c072cfad4334ca0ac1d1e05a92fc15c54eb9cf23c3efd84"}, + {file = "protobuf-5.29.3-cp38-abi3-manylinux2014_x86_64.whl", hash = "sha256:c027e08a08be10b67c06bf2370b99c811c466398c357e615ca88c91c07f0910f"}, + {file = "protobuf-5.29.3-cp38-cp38-win32.whl", hash = "sha256:84a57163a0ccef3f96e4b6a20516cedcf5bb3a95a657131c5c3ac62200d23252"}, + {file = "protobuf-5.29.3-cp38-cp38-win_amd64.whl", hash = "sha256:b89c115d877892a512f79a8114564fb435943b59067615894c3b13cd3e1fa107"}, + {file = "protobuf-5.29.3-cp39-cp39-win32.whl", hash = "sha256:0eb32bfa5219fc8d4111803e9a690658aa2e6366384fd0851064b963b6d1f2a7"}, + {file = "protobuf-5.29.3-cp39-cp39-win_amd64.whl", hash = "sha256:6ce8cc3389a20693bfde6c6562e03474c40851b44975c9b2bf6df7d8c4f864da"}, + {file = "protobuf-5.29.3-py3-none-any.whl", hash = "sha256:0a18ed4a24198528f2333802eb075e59dea9d679ab7a6c5efb017a59004d849f"}, + {file = "protobuf-5.29.3.tar.gz", hash = "sha256:5da0f41edaf117bde316404bad1a486cb4ededf8e4a54891296f648e8e076620"}, ] [[package]] name = "psutil" -version = "6.1.0" +version = "6.1.1" description = "Cross-platform lib for process and system monitoring in Python." optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7" files = [ - {file = "psutil-6.1.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:ff34df86226c0227c52f38b919213157588a678d049688eded74c76c8ba4a5d0"}, - {file = "psutil-6.1.0-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:c0e0c00aa18ca2d3b2b991643b799a15fc8f0563d2ebb6040f64ce8dc027b942"}, - {file = "psutil-6.1.0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:000d1d1ebd634b4efb383f4034437384e44a6d455260aaee2eca1e9c1b55f047"}, - {file = "psutil-6.1.0-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:5cd2bcdc75b452ba2e10f0e8ecc0b57b827dd5d7aaffbc6821b2a9a242823a76"}, - {file = "psutil-6.1.0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:045f00a43c737f960d273a83973b2511430d61f283a44c96bf13a6e829ba8fdc"}, - {file = "psutil-6.1.0-cp27-none-win32.whl", hash = "sha256:9118f27452b70bb1d9ab3198c1f626c2499384935aaf55388211ad982611407e"}, - {file = "psutil-6.1.0-cp27-none-win_amd64.whl", hash = "sha256:a8506f6119cff7015678e2bce904a4da21025cc70ad283a53b099e7620061d85"}, - {file = "psutil-6.1.0-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:6e2dcd475ce8b80522e51d923d10c7871e45f20918e027ab682f94f1c6351688"}, - {file = "psutil-6.1.0-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:0895b8414afafc526712c498bd9de2b063deaac4021a3b3c34566283464aff8e"}, - {file = "psutil-6.1.0-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9dcbfce5d89f1d1f2546a2090f4fcf87c7f669d1d90aacb7d7582addece9fb38"}, - {file = "psutil-6.1.0-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:498c6979f9c6637ebc3a73b3f87f9eb1ec24e1ce53a7c5173b8508981614a90b"}, - {file = "psutil-6.1.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d905186d647b16755a800e7263d43df08b790d709d575105d419f8b6ef65423a"}, - {file = "psutil-6.1.0-cp36-cp36m-win32.whl", hash = "sha256:6d3fbbc8d23fcdcb500d2c9f94e07b1342df8ed71b948a2649b5cb060a7c94ca"}, - {file = "psutil-6.1.0-cp36-cp36m-win_amd64.whl", hash = "sha256:1209036fbd0421afde505a4879dee3b2fd7b1e14fee81c0069807adcbbcca747"}, - {file = "psutil-6.1.0-cp37-abi3-win32.whl", hash = "sha256:1ad45a1f5d0b608253b11508f80940985d1d0c8f6111b5cb637533a0e6ddc13e"}, - {file = "psutil-6.1.0-cp37-abi3-win_amd64.whl", hash = "sha256:a8fb3752b491d246034fa4d279ff076501588ce8cbcdbb62c32fd7a377d996be"}, - {file = "psutil-6.1.0.tar.gz", hash = "sha256:353815f59a7f64cdaca1c0307ee13558a0512f6db064e92fe833784f08539c7a"}, + {file = "psutil-6.1.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:9ccc4316f24409159897799b83004cb1e24f9819b0dcf9c0b68bdcb6cefee6a8"}, + {file = "psutil-6.1.1-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:ca9609c77ea3b8481ab005da74ed894035936223422dc591d6772b147421f777"}, + {file = "psutil-6.1.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:8df0178ba8a9e5bc84fed9cfa61d54601b371fbec5c8eebad27575f1e105c0d4"}, + {file = "psutil-6.1.1-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:1924e659d6c19c647e763e78670a05dbb7feaf44a0e9c94bf9e14dfc6ba50468"}, + {file = "psutil-6.1.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:018aeae2af92d943fdf1da6b58665124897cfc94faa2ca92098838f83e1b1bca"}, + {file = "psutil-6.1.1-cp27-none-win32.whl", hash = "sha256:6d4281f5bbca041e2292be3380ec56a9413b790579b8e593b1784499d0005dac"}, + {file = "psutil-6.1.1-cp27-none-win_amd64.whl", hash = "sha256:c777eb75bb33c47377c9af68f30e9f11bc78e0f07fbf907be4a5d70b2fe5f030"}, + {file = "psutil-6.1.1-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:fc0ed7fe2231a444fc219b9c42d0376e0a9a1a72f16c5cfa0f68d19f1a0663e8"}, + {file = "psutil-6.1.1-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:0bdd4eab935276290ad3cb718e9809412895ca6b5b334f5a9111ee6d9aff9377"}, + {file = "psutil-6.1.1-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b6e06c20c05fe95a3d7302d74e7097756d4ba1247975ad6905441ae1b5b66003"}, + {file = "psutil-6.1.1-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97f7cb9921fbec4904f522d972f0c0e1f4fabbdd4e0287813b21215074a0f160"}, + {file = "psutil-6.1.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:33431e84fee02bc84ea36d9e2c4a6d395d479c9dd9bba2376c1f6ee8f3a4e0b3"}, + {file = "psutil-6.1.1-cp36-cp36m-win32.whl", hash = "sha256:384636b1a64b47814437d1173be1427a7c83681b17a450bfc309a1953e329603"}, + {file = "psutil-6.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:8be07491f6ebe1a693f17d4f11e69d0dc1811fa082736500f649f79df7735303"}, + {file = "psutil-6.1.1-cp37-abi3-win32.whl", hash = "sha256:eaa912e0b11848c4d9279a93d7e2783df352b082f40111e078388701fd479e53"}, + {file = "psutil-6.1.1-cp37-abi3-win_amd64.whl", hash = "sha256:f35cfccb065fff93529d2afb4a2e89e363fe63ca1e4a5da22b603a85833c2649"}, + {file = "psutil-6.1.1.tar.gz", hash = "sha256:cf8496728c18f2d0b45198f06895be52f36611711746b7f30c464b422b50e2f5"}, ] [package.extras] -dev = ["black", "check-manifest", "coverage", "packaging", "pylint", "pyperf", "pypinfo", "pytest-cov", "requests", "rstcheck", "ruff", "sphinx", "sphinx_rtd_theme", "toml-sort", "twine", "virtualenv", "wheel"] +dev = ["abi3audit", "black", "check-manifest", "coverage", "packaging", "pylint", "pyperf", "pypinfo", "pytest-cov", "requests", "rstcheck", "ruff", "sphinx", "sphinx_rtd_theme", "toml-sort", "twine", "virtualenv", "vulture", "wheel"] test = ["pytest", "pytest-xdist", "setuptools"] [[package]] @@ -3019,18 +3008,18 @@ files = [ [[package]] name = "pydantic" -version = "2.10.3" +version = "2.10.5" description = "Data validation using Python type hints" optional = true python-versions = ">=3.8" files = [ - {file = "pydantic-2.10.3-py3-none-any.whl", hash = "sha256:be04d85bbc7b65651c5f8e6b9976ed9c6f41782a55524cef079a34a0bb82144d"}, - {file = "pydantic-2.10.3.tar.gz", hash = "sha256:cb5ac360ce894ceacd69c403187900a02c4b20b693a9dd1d643e1effab9eadf9"}, + {file = "pydantic-2.10.5-py3-none-any.whl", hash = "sha256:4dd4e322dbe55472cb7ca7e73f4b63574eecccf2835ffa2af9021ce113c83c53"}, + {file = "pydantic-2.10.5.tar.gz", hash = "sha256:278b38dbbaec562011d659ee05f63346951b3a248a6f3642e1bc68894ea2b4ff"}, ] [package.dependencies] annotated-types = ">=0.6.0" -pydantic-core = "2.27.1" +pydantic-core = "2.27.2" typing-extensions = ">=4.12.2" [package.extras] @@ -3039,111 +3028,111 @@ timezone = ["tzdata"] [[package]] name = "pydantic-core" -version = "2.27.1" +version = "2.27.2" description = "Core functionality for Pydantic validation and serialization" optional = true python-versions = ">=3.8" files = [ - {file = "pydantic_core-2.27.1-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:71a5e35c75c021aaf400ac048dacc855f000bdfed91614b4a726f7432f1f3d6a"}, - {file = "pydantic_core-2.27.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:f82d068a2d6ecfc6e054726080af69a6764a10015467d7d7b9f66d6ed5afa23b"}, - {file = "pydantic_core-2.27.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:121ceb0e822f79163dd4699e4c54f5ad38b157084d97b34de8b232bcaad70278"}, - {file = "pydantic_core-2.27.1-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:4603137322c18eaf2e06a4495f426aa8d8388940f3c457e7548145011bb68e05"}, - {file = "pydantic_core-2.27.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a33cd6ad9017bbeaa9ed78a2e0752c5e250eafb9534f308e7a5f7849b0b1bfb4"}, - {file = "pydantic_core-2.27.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:15cc53a3179ba0fcefe1e3ae50beb2784dede4003ad2dfd24f81bba4b23a454f"}, - {file = "pydantic_core-2.27.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:45d9c5eb9273aa50999ad6adc6be5e0ecea7e09dbd0d31bd0c65a55a2592ca08"}, - {file = "pydantic_core-2.27.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:8bf7b66ce12a2ac52d16f776b31d16d91033150266eb796967a7e4621707e4f6"}, - {file = "pydantic_core-2.27.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:655d7dd86f26cb15ce8a431036f66ce0318648f8853d709b4167786ec2fa4807"}, - {file = "pydantic_core-2.27.1-cp310-cp310-musllinux_1_1_armv7l.whl", hash = "sha256:5556470f1a2157031e676f776c2bc20acd34c1990ca5f7e56f1ebf938b9ab57c"}, - {file = "pydantic_core-2.27.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f69ed81ab24d5a3bd93861c8c4436f54afdf8e8cc421562b0c7504cf3be58206"}, - {file = "pydantic_core-2.27.1-cp310-none-win32.whl", hash = "sha256:f5a823165e6d04ccea61a9f0576f345f8ce40ed533013580e087bd4d7442b52c"}, - {file = "pydantic_core-2.27.1-cp310-none-win_amd64.whl", hash = "sha256:57866a76e0b3823e0b56692d1a0bf722bffb324839bb5b7226a7dbd6c9a40b17"}, - {file = "pydantic_core-2.27.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:ac3b20653bdbe160febbea8aa6c079d3df19310d50ac314911ed8cc4eb7f8cb8"}, - {file = "pydantic_core-2.27.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a5a8e19d7c707c4cadb8c18f5f60c843052ae83c20fa7d44f41594c644a1d330"}, - {file = "pydantic_core-2.27.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7f7059ca8d64fea7f238994c97d91f75965216bcbe5f695bb44f354893f11d52"}, - {file = "pydantic_core-2.27.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:bed0f8a0eeea9fb72937ba118f9db0cb7e90773462af7962d382445f3005e5a4"}, - {file = "pydantic_core-2.27.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a3cb37038123447cf0f3ea4c74751f6a9d7afef0eb71aa07bf5f652b5e6a132c"}, - {file = "pydantic_core-2.27.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:84286494f6c5d05243456e04223d5a9417d7f443c3b76065e75001beb26f88de"}, - {file = "pydantic_core-2.27.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:acc07b2cfc5b835444b44a9956846b578d27beeacd4b52e45489e93276241025"}, - {file = "pydantic_core-2.27.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:4fefee876e07a6e9aad7a8c8c9f85b0cdbe7df52b8a9552307b09050f7512c7e"}, - {file = "pydantic_core-2.27.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:258c57abf1188926c774a4c94dd29237e77eda19462e5bb901d88adcab6af919"}, - {file = "pydantic_core-2.27.1-cp311-cp311-musllinux_1_1_armv7l.whl", hash = "sha256:35c14ac45fcfdf7167ca76cc80b2001205a8d5d16d80524e13508371fb8cdd9c"}, - {file = "pydantic_core-2.27.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d1b26e1dff225c31897696cab7d4f0a315d4c0d9e8666dbffdb28216f3b17fdc"}, - {file = "pydantic_core-2.27.1-cp311-none-win32.whl", hash = "sha256:2cdf7d86886bc6982354862204ae3b2f7f96f21a3eb0ba5ca0ac42c7b38598b9"}, - {file = "pydantic_core-2.27.1-cp311-none-win_amd64.whl", hash = "sha256:3af385b0cee8df3746c3f406f38bcbfdc9041b5c2d5ce3e5fc6637256e60bbc5"}, - {file = "pydantic_core-2.27.1-cp311-none-win_arm64.whl", hash = "sha256:81f2ec23ddc1b476ff96563f2e8d723830b06dceae348ce02914a37cb4e74b89"}, - {file = "pydantic_core-2.27.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:9cbd94fc661d2bab2bc702cddd2d3370bbdcc4cd0f8f57488a81bcce90c7a54f"}, - {file = "pydantic_core-2.27.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5f8c4718cd44ec1580e180cb739713ecda2bdee1341084c1467802a417fe0f02"}, - {file = "pydantic_core-2.27.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:15aae984e46de8d376df515f00450d1522077254ef6b7ce189b38ecee7c9677c"}, - {file = "pydantic_core-2.27.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:1ba5e3963344ff25fc8c40da90f44b0afca8cfd89d12964feb79ac1411a260ac"}, - {file = "pydantic_core-2.27.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:992cea5f4f3b29d6b4f7f1726ed8ee46c8331c6b4eed6db5b40134c6fe1768bb"}, - {file = "pydantic_core-2.27.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0325336f348dbee6550d129b1627cb8f5351a9dc91aad141ffb96d4937bd9529"}, - {file = "pydantic_core-2.27.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7597c07fbd11515f654d6ece3d0e4e5093edc30a436c63142d9a4b8e22f19c35"}, - {file = "pydantic_core-2.27.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:3bbd5d8cc692616d5ef6fbbbd50dbec142c7e6ad9beb66b78a96e9c16729b089"}, - {file = "pydantic_core-2.27.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:dc61505e73298a84a2f317255fcc72b710b72980f3a1f670447a21efc88f8381"}, - {file = "pydantic_core-2.27.1-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:e1f735dc43da318cad19b4173dd1ffce1d84aafd6c9b782b3abc04a0d5a6f5bb"}, - {file = "pydantic_core-2.27.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:f4e5658dbffe8843a0f12366a4c2d1c316dbe09bb4dfbdc9d2d9cd6031de8aae"}, - {file = "pydantic_core-2.27.1-cp312-none-win32.whl", hash = "sha256:672ebbe820bb37988c4d136eca2652ee114992d5d41c7e4858cdd90ea94ffe5c"}, - {file = "pydantic_core-2.27.1-cp312-none-win_amd64.whl", hash = "sha256:66ff044fd0bb1768688aecbe28b6190f6e799349221fb0de0e6f4048eca14c16"}, - {file = "pydantic_core-2.27.1-cp312-none-win_arm64.whl", hash = "sha256:9a3b0793b1bbfd4146304e23d90045f2a9b5fd5823aa682665fbdaf2a6c28f3e"}, - {file = "pydantic_core-2.27.1-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:f216dbce0e60e4d03e0c4353c7023b202d95cbaeff12e5fd2e82ea0a66905073"}, - {file = "pydantic_core-2.27.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a2e02889071850bbfd36b56fd6bc98945e23670773bc7a76657e90e6b6603c08"}, - {file = "pydantic_core-2.27.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42b0e23f119b2b456d07ca91b307ae167cc3f6c846a7b169fca5326e32fdc6cf"}, - {file = "pydantic_core-2.27.1-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:764be71193f87d460a03f1f7385a82e226639732214b402f9aa61f0d025f0737"}, - {file = "pydantic_core-2.27.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1c00666a3bd2f84920a4e94434f5974d7bbc57e461318d6bb34ce9cdbbc1f6b2"}, - {file = "pydantic_core-2.27.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3ccaa88b24eebc0f849ce0a4d09e8a408ec5a94afff395eb69baf868f5183107"}, - {file = "pydantic_core-2.27.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c65af9088ac534313e1963443d0ec360bb2b9cba6c2909478d22c2e363d98a51"}, - {file = "pydantic_core-2.27.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:206b5cf6f0c513baffaeae7bd817717140770c74528f3e4c3e1cec7871ddd61a"}, - {file = "pydantic_core-2.27.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:062f60e512fc7fff8b8a9d680ff0ddaaef0193dba9fa83e679c0c5f5fbd018bc"}, - {file = "pydantic_core-2.27.1-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:a0697803ed7d4af5e4c1adf1670af078f8fcab7a86350e969f454daf598c4960"}, - {file = "pydantic_core-2.27.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:58ca98a950171f3151c603aeea9303ef6c235f692fe555e883591103da709b23"}, - {file = "pydantic_core-2.27.1-cp313-none-win32.whl", hash = "sha256:8065914ff79f7eab1599bd80406681f0ad08f8e47c880f17b416c9f8f7a26d05"}, - {file = "pydantic_core-2.27.1-cp313-none-win_amd64.whl", hash = "sha256:ba630d5e3db74c79300d9a5bdaaf6200172b107f263c98a0539eeecb857b2337"}, - {file = "pydantic_core-2.27.1-cp313-none-win_arm64.whl", hash = "sha256:45cf8588c066860b623cd11c4ba687f8d7175d5f7ef65f7129df8a394c502de5"}, - {file = "pydantic_core-2.27.1-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:5897bec80a09b4084aee23f9b73a9477a46c3304ad1d2d07acca19723fb1de62"}, - {file = "pydantic_core-2.27.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:d0165ab2914379bd56908c02294ed8405c252250668ebcb438a55494c69f44ab"}, - {file = "pydantic_core-2.27.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b9af86e1d8e4cfc82c2022bfaa6f459381a50b94a29e95dcdda8442d6d83864"}, - {file = "pydantic_core-2.27.1-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5f6c8a66741c5f5447e047ab0ba7a1c61d1e95580d64bce852e3df1f895c4067"}, - {file = "pydantic_core-2.27.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9a42d6a8156ff78981f8aa56eb6394114e0dedb217cf8b729f438f643608cbcd"}, - {file = "pydantic_core-2.27.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:64c65f40b4cd8b0e049a8edde07e38b476da7e3aaebe63287c899d2cff253fa5"}, - {file = "pydantic_core-2.27.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9fdcf339322a3fae5cbd504edcefddd5a50d9ee00d968696846f089b4432cf78"}, - {file = "pydantic_core-2.27.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:bf99c8404f008750c846cb4ac4667b798a9f7de673ff719d705d9b2d6de49c5f"}, - {file = "pydantic_core-2.27.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:8f1edcea27918d748c7e5e4d917297b2a0ab80cad10f86631e488b7cddf76a36"}, - {file = "pydantic_core-2.27.1-cp38-cp38-musllinux_1_1_armv7l.whl", hash = "sha256:159cac0a3d096f79ab6a44d77a961917219707e2a130739c64d4dd46281f5c2a"}, - {file = "pydantic_core-2.27.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:029d9757eb621cc6e1848fa0b0310310de7301057f623985698ed7ebb014391b"}, - {file = "pydantic_core-2.27.1-cp38-none-win32.whl", hash = "sha256:a28af0695a45f7060e6f9b7092558a928a28553366519f64083c63a44f70e618"}, - {file = "pydantic_core-2.27.1-cp38-none-win_amd64.whl", hash = "sha256:2d4567c850905d5eaaed2f7a404e61012a51caf288292e016360aa2b96ff38d4"}, - {file = "pydantic_core-2.27.1-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:e9386266798d64eeb19dd3677051f5705bf873e98e15897ddb7d76f477131967"}, - {file = "pydantic_core-2.27.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4228b5b646caa73f119b1ae756216b59cc6e2267201c27d3912b592c5e323b60"}, - {file = "pydantic_core-2.27.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0b3dfe500de26c52abe0477dde16192ac39c98f05bf2d80e76102d394bd13854"}, - {file = "pydantic_core-2.27.1-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:aee66be87825cdf72ac64cb03ad4c15ffef4143dbf5c113f64a5ff4f81477bf9"}, - {file = "pydantic_core-2.27.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b748c44bb9f53031c8cbc99a8a061bc181c1000c60a30f55393b6e9c45cc5bd"}, - {file = "pydantic_core-2.27.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5ca038c7f6a0afd0b2448941b6ef9d5e1949e999f9e5517692eb6da58e9d44be"}, - {file = "pydantic_core-2.27.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6e0bd57539da59a3e4671b90a502da9a28c72322a4f17866ba3ac63a82c4498e"}, - {file = "pydantic_core-2.27.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ac6c2c45c847bbf8f91930d88716a0fb924b51e0c6dad329b793d670ec5db792"}, - {file = "pydantic_core-2.27.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b94d4ba43739bbe8b0ce4262bcc3b7b9f31459ad120fb595627eaeb7f9b9ca01"}, - {file = "pydantic_core-2.27.1-cp39-cp39-musllinux_1_1_armv7l.whl", hash = "sha256:00e6424f4b26fe82d44577b4c842d7df97c20be6439e8e685d0d715feceb9fb9"}, - {file = "pydantic_core-2.27.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:38de0a70160dd97540335b7ad3a74571b24f1dc3ed33f815f0880682e6880131"}, - {file = "pydantic_core-2.27.1-cp39-none-win32.whl", hash = "sha256:7ccebf51efc61634f6c2344da73e366c75e735960b5654b63d7e6f69a5885fa3"}, - {file = "pydantic_core-2.27.1-cp39-none-win_amd64.whl", hash = "sha256:a57847b090d7892f123726202b7daa20df6694cbd583b67a592e856bff603d6c"}, - {file = "pydantic_core-2.27.1-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:3fa80ac2bd5856580e242dbc202db873c60a01b20309c8319b5c5986fbe53ce6"}, - {file = "pydantic_core-2.27.1-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:d950caa237bb1954f1b8c9227b5065ba6875ac9771bb8ec790d956a699b78676"}, - {file = "pydantic_core-2.27.1-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0e4216e64d203e39c62df627aa882f02a2438d18a5f21d7f721621f7a5d3611d"}, - {file = "pydantic_core-2.27.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:02a3d637bd387c41d46b002f0e49c52642281edacd2740e5a42f7017feea3f2c"}, - {file = "pydantic_core-2.27.1-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:161c27ccce13b6b0c8689418da3885d3220ed2eae2ea5e9b2f7f3d48f1d52c27"}, - {file = "pydantic_core-2.27.1-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:19910754e4cc9c63bc1c7f6d73aa1cfee82f42007e407c0f413695c2f7ed777f"}, - {file = "pydantic_core-2.27.1-pp310-pypy310_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:e173486019cc283dc9778315fa29a363579372fe67045e971e89b6365cc035ed"}, - {file = "pydantic_core-2.27.1-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:af52d26579b308921b73b956153066481f064875140ccd1dfd4e77db89dbb12f"}, - {file = "pydantic_core-2.27.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:981fb88516bd1ae8b0cbbd2034678a39dedc98752f264ac9bc5839d3923fa04c"}, - {file = "pydantic_core-2.27.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:5fde892e6c697ce3e30c61b239330fc5d569a71fefd4eb6512fc6caec9dd9e2f"}, - {file = "pydantic_core-2.27.1-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:816f5aa087094099fff7edabb5e01cc370eb21aa1a1d44fe2d2aefdfb5599b31"}, - {file = "pydantic_core-2.27.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c10c309e18e443ddb108f0ef64e8729363adbfd92d6d57beec680f6261556f3"}, - {file = "pydantic_core-2.27.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:98476c98b02c8e9b2eec76ac4156fd006628b1b2d0ef27e548ffa978393fd154"}, - {file = "pydantic_core-2.27.1-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c3027001c28434e7ca5a6e1e527487051136aa81803ac812be51802150d880dd"}, - {file = "pydantic_core-2.27.1-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:7699b1df36a48169cdebda7ab5a2bac265204003f153b4bd17276153d997670a"}, - {file = "pydantic_core-2.27.1-pp39-pypy39_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:1c39b07d90be6b48968ddc8c19e7585052088fd7ec8d568bb31ff64c70ae3c97"}, - {file = "pydantic_core-2.27.1-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:46ccfe3032b3915586e469d4972973f893c0a2bb65669194a5bdea9bacc088c2"}, - {file = "pydantic_core-2.27.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:62ba45e21cf6571d7f716d903b5b7b6d2617e2d5d67c0923dc47b9d41369f840"}, - {file = "pydantic_core-2.27.1.tar.gz", hash = "sha256:62a763352879b84aa31058fc931884055fd75089cccbd9d58bb6afd01141b235"}, + {file = "pydantic_core-2.27.2-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:2d367ca20b2f14095a8f4fa1210f5a7b78b8a20009ecced6b12818f455b1e9fa"}, + {file = "pydantic_core-2.27.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:491a2b73db93fab69731eaee494f320faa4e093dbed776be1a829c2eb222c34c"}, + {file = "pydantic_core-2.27.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7969e133a6f183be60e9f6f56bfae753585680f3b7307a8e555a948d443cc05a"}, + {file = "pydantic_core-2.27.2-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:3de9961f2a346257caf0aa508a4da705467f53778e9ef6fe744c038119737ef5"}, + {file = "pydantic_core-2.27.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e2bb4d3e5873c37bb3dd58714d4cd0b0e6238cebc4177ac8fe878f8b3aa8e74c"}, + {file = "pydantic_core-2.27.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:280d219beebb0752699480fe8f1dc61ab6615c2046d76b7ab7ee38858de0a4e7"}, + {file = "pydantic_core-2.27.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47956ae78b6422cbd46f772f1746799cbb862de838fd8d1fbd34a82e05b0983a"}, + {file = "pydantic_core-2.27.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:14d4a5c49d2f009d62a2a7140d3064f686d17a5d1a268bc641954ba181880236"}, + {file = "pydantic_core-2.27.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:337b443af21d488716f8d0b6164de833e788aa6bd7e3a39c005febc1284f4962"}, + {file = "pydantic_core-2.27.2-cp310-cp310-musllinux_1_1_armv7l.whl", hash = "sha256:03d0f86ea3184a12f41a2d23f7ccb79cdb5a18e06993f8a45baa8dfec746f0e9"}, + {file = "pydantic_core-2.27.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7041c36f5680c6e0f08d922aed302e98b3745d97fe1589db0a3eebf6624523af"}, + {file = "pydantic_core-2.27.2-cp310-cp310-win32.whl", hash = "sha256:50a68f3e3819077be2c98110c1f9dcb3817e93f267ba80a2c05bb4f8799e2ff4"}, + {file = "pydantic_core-2.27.2-cp310-cp310-win_amd64.whl", hash = "sha256:e0fd26b16394ead34a424eecf8a31a1f5137094cabe84a1bcb10fa6ba39d3d31"}, + {file = "pydantic_core-2.27.2-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:8e10c99ef58cfdf2a66fc15d66b16c4a04f62bca39db589ae8cba08bc55331bc"}, + {file = "pydantic_core-2.27.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:26f32e0adf166a84d0cb63be85c562ca8a6fa8de28e5f0d92250c6b7e9e2aff7"}, + {file = "pydantic_core-2.27.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8c19d1ea0673cd13cc2f872f6c9ab42acc4e4f492a7ca9d3795ce2b112dd7e15"}, + {file = "pydantic_core-2.27.2-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5e68c4446fe0810e959cdff46ab0a41ce2f2c86d227d96dc3847af0ba7def306"}, + {file = "pydantic_core-2.27.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d9640b0059ff4f14d1f37321b94061c6db164fbe49b334b31643e0528d100d99"}, + {file = "pydantic_core-2.27.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:40d02e7d45c9f8af700f3452f329ead92da4c5f4317ca9b896de7ce7199ea459"}, + {file = "pydantic_core-2.27.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c1fd185014191700554795c99b347d64f2bb637966c4cfc16998a0ca700d048"}, + {file = "pydantic_core-2.27.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d81d2068e1c1228a565af076598f9e7451712700b673de8f502f0334f281387d"}, + {file = "pydantic_core-2.27.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:1a4207639fb02ec2dbb76227d7c751a20b1a6b4bc52850568e52260cae64ca3b"}, + {file = "pydantic_core-2.27.2-cp311-cp311-musllinux_1_1_armv7l.whl", hash = "sha256:3de3ce3c9ddc8bbd88f6e0e304dea0e66d843ec9de1b0042b0911c1663ffd474"}, + {file = "pydantic_core-2.27.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:30c5f68ded0c36466acede341551106821043e9afaad516adfb6e8fa80a4e6a6"}, + {file = "pydantic_core-2.27.2-cp311-cp311-win32.whl", hash = "sha256:c70c26d2c99f78b125a3459f8afe1aed4d9687c24fd677c6a4436bc042e50d6c"}, + {file = "pydantic_core-2.27.2-cp311-cp311-win_amd64.whl", hash = "sha256:08e125dbdc505fa69ca7d9c499639ab6407cfa909214d500897d02afb816e7cc"}, + {file = "pydantic_core-2.27.2-cp311-cp311-win_arm64.whl", hash = "sha256:26f0d68d4b235a2bae0c3fc585c585b4ecc51382db0e3ba402a22cbc440915e4"}, + {file = "pydantic_core-2.27.2-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:9e0c8cfefa0ef83b4da9588448b6d8d2a2bf1a53c3f1ae5fca39eb3061e2f0b0"}, + {file = "pydantic_core-2.27.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:83097677b8e3bd7eaa6775720ec8e0405f1575015a463285a92bfdfe254529ef"}, + {file = "pydantic_core-2.27.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:172fce187655fece0c90d90a678424b013f8fbb0ca8b036ac266749c09438cb7"}, + {file = "pydantic_core-2.27.2-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:519f29f5213271eeeeb3093f662ba2fd512b91c5f188f3bb7b27bc5973816934"}, + {file = "pydantic_core-2.27.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:05e3a55d124407fffba0dd6b0c0cd056d10e983ceb4e5dbd10dda135c31071d6"}, + {file = "pydantic_core-2.27.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9c3ed807c7b91de05e63930188f19e921d1fe90de6b4f5cd43ee7fcc3525cb8c"}, + {file = "pydantic_core-2.27.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6fb4aadc0b9a0c063206846d603b92030eb6f03069151a625667f982887153e2"}, + {file = "pydantic_core-2.27.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:28ccb213807e037460326424ceb8b5245acb88f32f3d2777427476e1b32c48c4"}, + {file = "pydantic_core-2.27.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:de3cd1899e2c279b140adde9357c4495ed9d47131b4a4eaff9052f23398076b3"}, + {file = "pydantic_core-2.27.2-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:220f892729375e2d736b97d0e51466252ad84c51857d4d15f5e9692f9ef12be4"}, + {file = "pydantic_core-2.27.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a0fcd29cd6b4e74fe8ddd2c90330fd8edf2e30cb52acda47f06dd615ae72da57"}, + {file = "pydantic_core-2.27.2-cp312-cp312-win32.whl", hash = "sha256:1e2cb691ed9834cd6a8be61228471d0a503731abfb42f82458ff27be7b2186fc"}, + {file = "pydantic_core-2.27.2-cp312-cp312-win_amd64.whl", hash = "sha256:cc3f1a99a4f4f9dd1de4fe0312c114e740b5ddead65bb4102884b384c15d8bc9"}, + {file = "pydantic_core-2.27.2-cp312-cp312-win_arm64.whl", hash = "sha256:3911ac9284cd8a1792d3cb26a2da18f3ca26c6908cc434a18f730dc0db7bfa3b"}, + {file = "pydantic_core-2.27.2-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:7d14bd329640e63852364c306f4d23eb744e0f8193148d4044dd3dacdaacbd8b"}, + {file = "pydantic_core-2.27.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:82f91663004eb8ed30ff478d77c4d1179b3563df6cdb15c0817cd1cdaf34d154"}, + {file = "pydantic_core-2.27.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:71b24c7d61131bb83df10cc7e687433609963a944ccf45190cfc21e0887b08c9"}, + {file = "pydantic_core-2.27.2-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fa8e459d4954f608fa26116118bb67f56b93b209c39b008277ace29937453dc9"}, + {file = "pydantic_core-2.27.2-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ce8918cbebc8da707ba805b7fd0b382816858728ae7fe19a942080c24e5b7cd1"}, + {file = "pydantic_core-2.27.2-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:eda3f5c2a021bbc5d976107bb302e0131351c2ba54343f8a496dc8783d3d3a6a"}, + {file = "pydantic_core-2.27.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bd8086fa684c4775c27f03f062cbb9eaa6e17f064307e86b21b9e0abc9c0f02e"}, + {file = "pydantic_core-2.27.2-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:8d9b3388db186ba0c099a6d20f0604a44eabdeef1777ddd94786cdae158729e4"}, + {file = "pydantic_core-2.27.2-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:7a66efda2387de898c8f38c0cf7f14fca0b51a8ef0b24bfea5849f1b3c95af27"}, + {file = "pydantic_core-2.27.2-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:18a101c168e4e092ab40dbc2503bdc0f62010e95d292b27827871dc85450d7ee"}, + {file = "pydantic_core-2.27.2-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:ba5dd002f88b78a4215ed2f8ddbdf85e8513382820ba15ad5ad8955ce0ca19a1"}, + {file = "pydantic_core-2.27.2-cp313-cp313-win32.whl", hash = "sha256:1ebaf1d0481914d004a573394f4be3a7616334be70261007e47c2a6fe7e50130"}, + {file = "pydantic_core-2.27.2-cp313-cp313-win_amd64.whl", hash = "sha256:953101387ecf2f5652883208769a79e48db18c6df442568a0b5ccd8c2723abee"}, + {file = "pydantic_core-2.27.2-cp313-cp313-win_arm64.whl", hash = "sha256:ac4dbfd1691affb8f48c2c13241a2e3b60ff23247cbcf981759c768b6633cf8b"}, + {file = "pydantic_core-2.27.2-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:d3e8d504bdd3f10835468f29008d72fc8359d95c9c415ce6e767203db6127506"}, + {file = "pydantic_core-2.27.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:521eb9b7f036c9b6187f0b47318ab0d7ca14bd87f776240b90b21c1f4f149320"}, + {file = "pydantic_core-2.27.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:85210c4d99a0114f5a9481b44560d7d1e35e32cc5634c656bc48e590b669b145"}, + {file = "pydantic_core-2.27.2-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d716e2e30c6f140d7560ef1538953a5cd1a87264c737643d481f2779fc247fe1"}, + {file = "pydantic_core-2.27.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f66d89ba397d92f840f8654756196d93804278457b5fbede59598a1f9f90b228"}, + {file = "pydantic_core-2.27.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:669e193c1c576a58f132e3158f9dfa9662969edb1a250c54d8fa52590045f046"}, + {file = "pydantic_core-2.27.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9fdbe7629b996647b99c01b37f11170a57ae675375b14b8c13b8518b8320ced5"}, + {file = "pydantic_core-2.27.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d262606bf386a5ba0b0af3b97f37c83d7011439e3dc1a9298f21efb292e42f1a"}, + {file = "pydantic_core-2.27.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:cabb9bcb7e0d97f74df8646f34fc76fbf793b7f6dc2438517d7a9e50eee4f14d"}, + {file = "pydantic_core-2.27.2-cp38-cp38-musllinux_1_1_armv7l.whl", hash = "sha256:d2d63f1215638d28221f664596b1ccb3944f6e25dd18cd3b86b0a4c408d5ebb9"}, + {file = "pydantic_core-2.27.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:bca101c00bff0adb45a833f8451b9105d9df18accb8743b08107d7ada14bd7da"}, + {file = "pydantic_core-2.27.2-cp38-cp38-win32.whl", hash = "sha256:f6f8e111843bbb0dee4cb6594cdc73e79b3329b526037ec242a3e49012495b3b"}, + {file = "pydantic_core-2.27.2-cp38-cp38-win_amd64.whl", hash = "sha256:fd1aea04935a508f62e0d0ef1f5ae968774a32afc306fb8545e06f5ff5cdf3ad"}, + {file = "pydantic_core-2.27.2-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:c10eb4f1659290b523af58fa7cffb452a61ad6ae5613404519aee4bfbf1df993"}, + {file = "pydantic_core-2.27.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ef592d4bad47296fb11f96cd7dc898b92e795032b4894dfb4076cfccd43a9308"}, + {file = "pydantic_core-2.27.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c61709a844acc6bf0b7dce7daae75195a10aac96a596ea1b776996414791ede4"}, + {file = "pydantic_core-2.27.2-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:42c5f762659e47fdb7b16956c71598292f60a03aa92f8b6351504359dbdba6cf"}, + {file = "pydantic_core-2.27.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4c9775e339e42e79ec99c441d9730fccf07414af63eac2f0e48e08fd38a64d76"}, + {file = "pydantic_core-2.27.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:57762139821c31847cfb2df63c12f725788bd9f04bc2fb392790959b8f70f118"}, + {file = "pydantic_core-2.27.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0d1e85068e818c73e048fe28cfc769040bb1f475524f4745a5dc621f75ac7630"}, + {file = "pydantic_core-2.27.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:097830ed52fd9e427942ff3b9bc17fab52913b2f50f2880dc4a5611446606a54"}, + {file = "pydantic_core-2.27.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:044a50963a614ecfae59bb1eaf7ea7efc4bc62f49ed594e18fa1e5d953c40e9f"}, + {file = "pydantic_core-2.27.2-cp39-cp39-musllinux_1_1_armv7l.whl", hash = "sha256:4e0b4220ba5b40d727c7f879eac379b822eee5d8fff418e9d3381ee45b3b0362"}, + {file = "pydantic_core-2.27.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5e4f4bb20d75e9325cc9696c6802657b58bc1dbbe3022f32cc2b2b632c3fbb96"}, + {file = "pydantic_core-2.27.2-cp39-cp39-win32.whl", hash = "sha256:cca63613e90d001b9f2f9a9ceb276c308bfa2a43fafb75c8031c4f66039e8c6e"}, + {file = "pydantic_core-2.27.2-cp39-cp39-win_amd64.whl", hash = "sha256:77d1bca19b0f7021b3a982e6f903dcd5b2b06076def36a652e3907f596e29f67"}, + {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:2bf14caea37e91198329b828eae1618c068dfb8ef17bb33287a7ad4b61ac314e"}, + {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:b0cb791f5b45307caae8810c2023a184c74605ec3bcbb67d13846c28ff731ff8"}, + {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:688d3fd9fcb71f41c4c015c023d12a79d1c4c0732ec9eb35d96e3388a120dcf3"}, + {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d591580c34f4d731592f0e9fe40f9cc1b430d297eecc70b962e93c5c668f15f"}, + {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:82f986faf4e644ffc189a7f1aafc86e46ef70372bb153e7001e8afccc6e54133"}, + {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:bec317a27290e2537f922639cafd54990551725fc844249e64c523301d0822fc"}, + {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:0296abcb83a797db256b773f45773da397da75a08f5fcaef41f2044adec05f50"}, + {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:0d75070718e369e452075a6017fbf187f788e17ed67a3abd47fa934d001863d9"}, + {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:7e17b560be3c98a8e3aa66ce828bdebb9e9ac6ad5466fba92eb74c4c95cb1151"}, + {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:c33939a82924da9ed65dab5a65d427205a73181d8098e79b6b426bdf8ad4e656"}, + {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:00bad2484fa6bda1e216e7345a798bd37c68fb2d97558edd584942aa41b7d278"}, + {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c817e2b40aba42bac6f457498dacabc568c3b7a986fc9ba7c8d9d260b71485fb"}, + {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:251136cdad0cb722e93732cb45ca5299fb56e1344a833640bf93b2803f8d1bfd"}, + {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d2088237af596f0a524d3afc39ab3b036e8adb054ee57cbb1dcf8e09da5b29cc"}, + {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:d4041c0b966a84b4ae7a09832eb691a35aec90910cd2dbe7a208de59be77965b"}, + {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:8083d4e875ebe0b864ffef72a4304827015cff328a1be6e22cc850753bfb122b"}, + {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f141ee28a0ad2123b6611b6ceff018039df17f32ada8b534e6aa039545a3efb2"}, + {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:7d0c8399fcc1848491f00e0314bd59fb34a9c008761bcb422a057670c3f65e35"}, + {file = "pydantic_core-2.27.2.tar.gz", hash = "sha256:eb026e5a4c1fee05726072337ff51d1efb6f59090b7da90d30ea58625b1ffb39"}, ] [package.dependencies] @@ -3151,13 +3140,13 @@ typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0" [[package]] name = "pygments" -version = "2.18.0" +version = "2.19.1" description = "Pygments is a syntax highlighting package written in Python." optional = false python-versions = ">=3.8" files = [ - {file = "pygments-2.18.0-py3-none-any.whl", hash = "sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a"}, - {file = "pygments-2.18.0.tar.gz", hash = "sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199"}, + {file = "pygments-2.19.1-py3-none-any.whl", hash = "sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c"}, + {file = "pygments-2.19.1.tar.gz", hash = "sha256:61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f"}, ] [package.extras] @@ -3165,13 +3154,13 @@ windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pyparsing" -version = "3.2.0" +version = "3.2.1" description = "pyparsing module - Classes and methods to define and execute parsing grammars" optional = true python-versions = ">=3.9" files = [ - {file = "pyparsing-3.2.0-py3-none-any.whl", hash = "sha256:93d9577b88da0bbea8cc8334ee8b918ed014968fd2ec383e868fb8afb1ccef84"}, - {file = "pyparsing-3.2.0.tar.gz", hash = "sha256:cbf74e27246d595d9a74b186b810f6fbb86726dbf3b9532efb343f6d7294fe9c"}, + {file = "pyparsing-3.2.1-py3-none-any.whl", hash = "sha256:506ff4f4386c4cec0590ec19e6302d3aedb992fdc02c761e90416f158dacf8e1"}, + {file = "pyparsing-3.2.1.tar.gz", hash = "sha256:61980854fd66de3a90028d679a954d5f2623e83144b5afe5ee86f43d762e5f0a"}, ] [package.extras] @@ -3847,23 +3836,23 @@ win32 = ["pywin32"] [[package]] name = "setuptools" -version = "75.6.0" +version = "75.8.0" description = "Easily download, build, install, upgrade, and uninstall Python packages" optional = false python-versions = ">=3.9" files = [ - {file = "setuptools-75.6.0-py3-none-any.whl", hash = "sha256:ce74b49e8f7110f9bf04883b730f4765b774ef3ef28f722cce7c273d253aaf7d"}, - {file = "setuptools-75.6.0.tar.gz", hash = "sha256:8199222558df7c86216af4f84c30e9b34a61d8ba19366cc914424cdbd28252f6"}, + {file = "setuptools-75.8.0-py3-none-any.whl", hash = "sha256:e3982f444617239225d675215d51f6ba05f845d4eec313da4418fdbb56fb27e3"}, + {file = "setuptools-75.8.0.tar.gz", hash = "sha256:c5afc8f407c626b8313a86e10311dd3f661c6cd9c09d4bf8c15c0e11f9f2b0e6"}, ] [package.extras] -check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)", "ruff (>=0.7.0)"] +check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)", "ruff (>=0.8.0)"] core = ["importlib_metadata (>=6)", "jaraco.collections", "jaraco.functools (>=4)", "jaraco.text (>=3.7)", "more_itertools", "more_itertools (>=8.8)", "packaging", "packaging (>=24.2)", "platformdirs (>=4.2.2)", "tomli (>=2.0.1)", "wheel (>=0.43.0)"] cover = ["pytest-cov"] doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier", "towncrier (<24.7)"] enabler = ["pytest-enabler (>=2.2)"] -test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test (>=5.5)", "packaging (>=24.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"] -type = ["importlib_metadata (>=7.0.2)", "jaraco.develop (>=7.21)", "mypy (>=1.12,<1.14)", "pytest-mypy"] +test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.7.2)", "jaraco.test (>=5.5)", "packaging (>=24.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"] +type = ["importlib_metadata (>=7.0.2)", "jaraco.develop (>=7.21)", "mypy (==1.14.*)", "pytest-mypy"] [[package]] name = "shapely" @@ -4424,13 +4413,13 @@ files = [ [[package]] name = "urllib3" -version = "2.2.3" +version = "2.3.0" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "urllib3-2.2.3-py3-none-any.whl", hash = "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac"}, - {file = "urllib3-2.2.3.tar.gz", hash = "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"}, + {file = "urllib3-2.3.0-py3-none-any.whl", hash = "sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df"}, + {file = "urllib3-2.3.0.tar.gz", hash = "sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d"}, ] [package.extras] From 06d27bf9b4ad57950b03a8f06792e74993786d79 Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Sat, 11 Jan 2025 20:10:44 +0200 Subject: [PATCH 3/6] fix format --- .github/workflows/test.yml | 4 ++ graphrag_sdk/__init__.py | 2 +- graphrag_sdk/agents/__init__.py | 2 +- graphrag_sdk/agents/agent.py | 1 + graphrag_sdk/agents/kg_agent.py | 3 +- graphrag_sdk/attribute.py | 24 ++++---- graphrag_sdk/chat_session.py | 49 +++++++++------- graphrag_sdk/document.py | 2 +- graphrag_sdk/document_loaders/jsonl.py | 6 +- graphrag_sdk/document_loaders/pdf.py | 16 +++--- graphrag_sdk/document_loaders/text.py | 9 ++- graphrag_sdk/document_loaders/url.py | 11 ++-- graphrag_sdk/fixtures/regex.py | 2 +- graphrag_sdk/helpers.py | 18 +++--- graphrag_sdk/kg.py | 56 +++++++++++++----- graphrag_sdk/model_config.py | 4 +- graphrag_sdk/models/__init__.py | 2 +- graphrag_sdk/models/azure_openai.py | 48 ++++++++-------- graphrag_sdk/models/gemini.py | 27 ++++----- graphrag_sdk/models/litellm.py | 57 ++++++++++--------- graphrag_sdk/models/model.py | 10 +++- graphrag_sdk/models/ollama.py | 47 ++++++++------- graphrag_sdk/models/openai.py | 28 ++++----- graphrag_sdk/orchestrator/__init__.py | 6 +- graphrag_sdk/orchestrator/orchestrator.py | 2 +- graphrag_sdk/orchestrator/step.py | 8 ++- graphrag_sdk/orchestrator/step_result.py | 1 + graphrag_sdk/orchestrator/steps/__init__.py | 2 +- graphrag_sdk/orchestrator/steps/agent.py | 4 +- graphrag_sdk/orchestrator/steps/parallel.py | 9 +-- graphrag_sdk/orchestrator/steps/user_input.py | 4 +- graphrag_sdk/relation.py | 4 +- graphrag_sdk/steps/create_ontology_step.py | 34 +++++++---- graphrag_sdk/steps/extract_data_step.py | 41 +++++++++---- graphrag_sdk/steps/graph_query_step.py | 8 ++- tests/test_auto_create_ontology.py | 1 + tests/test_helper_validate_cypher.py | 2 +- tests/test_kg_gemini.py | 6 +- tests/test_kg_litellm_openai.py | 7 ++- tests/test_kg_ollama.py | 22 +++++-- tests/test_kg_openai.py | 5 +- tests/test_multi_agent.py | 1 - 42 files changed, 345 insertions(+), 250 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d83d860..339c796 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,6 +33,10 @@ jobs: with: python-version: 3.x # Update with desired Python version + - uses: datadog/action-py-black-formatter@v2.1 + with: + check_mode: "true" + - uses: astral-sh/ruff-action@v3 with: src: >- diff --git a/graphrag_sdk/__init__.py b/graphrag_sdk/__init__.py index 0f50159..e233157 100644 --- a/graphrag_sdk/__init__.py +++ b/graphrag_sdk/__init__.py @@ -37,4 +37,4 @@ "Relation", "Attribute", "AttributeType", -] \ No newline at end of file +] diff --git a/graphrag_sdk/agents/__init__.py b/graphrag_sdk/agents/__init__.py index be1ac3e..a6df24a 100644 --- a/graphrag_sdk/agents/__init__.py +++ b/graphrag_sdk/agents/__init__.py @@ -1,3 +1,3 @@ from .agent import Agent -__all__ = ['Agent'] +__all__ = ["Agent"] diff --git a/graphrag_sdk/agents/agent.py b/graphrag_sdk/agents/agent.py index d896c08..5d1a35b 100644 --- a/graphrag_sdk/agents/agent.py +++ b/graphrag_sdk/agents/agent.py @@ -1,5 +1,6 @@ from abc import ABC, abstractmethod + class AgentResponseCode: """ Represents the response codes for an agent. diff --git a/graphrag_sdk/agents/kg_agent.py b/graphrag_sdk/agents/kg_agent.py index 33a73dd..76556e3 100644 --- a/graphrag_sdk/agents/kg_agent.py +++ b/graphrag_sdk/agents/kg_agent.py @@ -1,6 +1,7 @@ from graphrag_sdk.kg import KnowledgeGraph from .agent import Agent + class KGAgent(Agent): """Represents an Agent for a FalkorDB Knowledge Graph. @@ -134,7 +135,7 @@ def run(self, params: dict) -> str: """ output = self.chat_session.send_message(params["prompt"]) - return output['response'] + return output["response"] def __repr__(self): """ diff --git a/graphrag_sdk/attribute.py b/graphrag_sdk/attribute.py index 373c563..a784a6a 100644 --- a/graphrag_sdk/attribute.py +++ b/graphrag_sdk/attribute.py @@ -41,18 +41,18 @@ def from_string(txt: str): class Attribute: - """ Represents an attribute of an entity or relation in the ontology. - - Args: - name (str): The name of the attribute. - attr_type (AttributeType): The type of the attribute. - unique (bool): Whether the attribute is unique. - required (bool): Whether the attribute is required. - - Examples: - >>> attr = Attribute("name", AttributeType.STRING, True, True) - >>> print(attr) - name: "string!*" + """Represents an attribute of an entity or relation in the ontology. + + Args: + name (str): The name of the attribute. + attr_type (AttributeType): The type of the attribute. + unique (bool): Whether the attribute is unique. + required (bool): Whether the attribute is required. + + Examples: + >>> attr = Attribute("name", AttributeType.STRING, True, True) + >>> print(attr) + name: "string!*" """ def __init__( diff --git a/graphrag_sdk/chat_session.py b/graphrag_sdk/chat_session.py index ea1676d..b5d5bc1 100644 --- a/graphrag_sdk/chat_session.py +++ b/graphrag_sdk/chat_session.py @@ -24,9 +24,17 @@ class ChatSession: >>> chat_session.send_message("What is the capital of France?") """ - def __init__(self, model_config: KnowledgeGraphModelConfig, ontology: Ontology, graph: Graph, - cypher_system_instruction: str, qa_system_instruction: str, - cypher_gen_prompt: str, qa_prompt: str, cypher_gen_prompt_history: str): + def __init__( + self, + model_config: KnowledgeGraphModelConfig, + ontology: Ontology, + graph: Graph, + cypher_system_instruction: str, + qa_system_instruction: str, + cypher_gen_prompt: str, + qa_prompt: str, + cypher_gen_prompt_history: str, + ): """ Initializes a new ChatSession object. @@ -45,21 +53,22 @@ def __init__(self, model_config: KnowledgeGraphModelConfig, ontology: Ontology, self.model_config = model_config self.graph = graph self.ontology = ontology - cypher_system_instruction = cypher_system_instruction.format(ontology=str(ontology.to_json())) + cypher_system_instruction = cypher_system_instruction.format( + ontology=str(ontology.to_json()) + ) - self.cypher_prompt = cypher_gen_prompt self.qa_prompt = qa_prompt self.cypher_prompt_with_history = cypher_gen_prompt_history - + self.cypher_chat_session = ( model_config.cypher_generation.with_system_instruction( cypher_system_instruction ).start_chat() ) self.qa_chat_session = model_config.qa.with_system_instruction( - qa_system_instruction - ).start_chat() + qa_system_instruction + ).start_chat() self.last_answer = None def send_message(self, message: str): @@ -71,9 +80,9 @@ def send_message(self, message: str): Returns: dict: The response to the message in the following format: - {"question": message, - "response": answer, - "context": context, + {"question": message, + "response": answer, + "context": context, "cypher": cypher} """ cypher_step = GraphQueryGenerationStep( @@ -82,7 +91,7 @@ def send_message(self, message: str): ontology=self.ontology, last_answer=self.last_answer, cypher_prompt=self.cypher_prompt, - cypher_prompt_with_history=self.cypher_prompt_with_history + cypher_prompt_with_history=self.cypher_prompt_with_history, ) (context, cypher) = cypher_step.run(message) @@ -92,8 +101,8 @@ def send_message(self, message: str): "question": message, "response": "I am sorry, I could not find the answer to your question", "context": None, - "cypher": None - } + "cypher": None, + } qa_step = QAStep( chat_session=self.qa_chat_session, @@ -102,10 +111,10 @@ def send_message(self, message: str): answer = qa_step.run(message, cypher, context) self.last_answer = answer - + return { - "question": message, - "response": answer, - "context": context, - "cypher": cypher - } \ No newline at end of file + "question": message, + "response": answer, + "context": context, + "cypher": cypher, + } diff --git a/graphrag_sdk/document.py b/graphrag_sdk/document.py index 1dc0bf5..bbf2e42 100644 --- a/graphrag_sdk/document.py +++ b/graphrag_sdk/document.py @@ -1,4 +1,4 @@ -class Document(): +class Document: """ Common class containing text extracted from a source """ diff --git a/graphrag_sdk/document_loaders/jsonl.py b/graphrag_sdk/document_loaders/jsonl.py index 6b4fdfa..5f87ae3 100644 --- a/graphrag_sdk/document_loaders/jsonl.py +++ b/graphrag_sdk/document_loaders/jsonl.py @@ -18,10 +18,6 @@ def load(self) -> Iterator[Document]: num_documents = num_rows // self.rows_per_document for i in range(num_documents): content = "\n".join( - rows[ - i - * self.rows_per_document : (i + 1) - * self.rows_per_document - ] + rows[i * self.rows_per_document : (i + 1) * self.rows_per_document] ) yield Document(content) diff --git a/graphrag_sdk/document_loaders/pdf.py b/graphrag_sdk/document_loaders/pdf.py index 7b01d9b..1c086b2 100644 --- a/graphrag_sdk/document_loaders/pdf.py +++ b/graphrag_sdk/document_loaders/pdf.py @@ -1,7 +1,8 @@ from typing import Iterator from graphrag_sdk.document import Document -class PDFLoader(): + +class PDFLoader: """ Load PDF """ @@ -15,11 +16,11 @@ def __init__(self, path: str) -> None: """ try: - __import__('pypdf') + __import__("pypdf") except ModuleNotFoundError: raise ModuleNotFoundError( "pypdf package not found, please install it with " "`pip install pypdf`" - ) + ) self.path = path @@ -30,11 +31,8 @@ def load(self) -> Iterator[Document]: Returns: Iterator[Document]: document iterator """ - - from pypdf import PdfReader # pylint: disable=import-outside-toplevel + + from pypdf import PdfReader # pylint: disable=import-outside-toplevel reader = PdfReader(self.path) - yield from [ - Document(page.extract_text()) - for page in reader.pages - ] + yield from [Document(page.extract_text()) for page in reader.pages] diff --git a/graphrag_sdk/document_loaders/text.py b/graphrag_sdk/document_loaders/text.py index ca9115e..898394b 100644 --- a/graphrag_sdk/document_loaders/text.py +++ b/graphrag_sdk/document_loaders/text.py @@ -1,7 +1,8 @@ from typing import Iterator from graphrag_sdk.document import Document -class TextLoader(): + +class TextLoader: """ Load Text """ @@ -24,7 +25,5 @@ def load(self) -> Iterator[Document]: Iterator[Document]: document iterator """ - with open(self.path, 'r') as f: - yield Document( - f.read() - ) + with open(self.path, "r") as f: + yield Document(f.read()) diff --git a/graphrag_sdk/document_loaders/url.py b/graphrag_sdk/document_loaders/url.py index 1017050..edcaaa8 100644 --- a/graphrag_sdk/document_loaders/url.py +++ b/graphrag_sdk/document_loaders/url.py @@ -4,7 +4,8 @@ from bs4 import BeautifulSoup from graphrag_sdk.document import Document -class URLLoader(): + +class URLLoader: """ Load URL """ @@ -21,7 +22,7 @@ def __init__(self, url: str) -> None: def _download(self) -> str: try: - response = requests.get(self.url, headers={'User-Agent': 'Mozilla/5.0'}) + response = requests.get(self.url, headers={"User-Agent": "Mozilla/5.0"}) response.raise_for_status() # Raise an HTTPError for bad responses (4xx and 5xx) return response.text except requests.exceptions.RequestException as e: @@ -39,13 +40,13 @@ def load(self) -> Iterator[Document]: content = self._download() # extract text from HTML, populate content - soup = BeautifulSoup(content, 'html.parser') + soup = BeautifulSoup(content, "html.parser") # Extract text from the HTML content = soup.get_text() # Remove extra newlines - content = re.sub(r'\n{2,}', '\n', content) + content = re.sub(r"\n{2,}", "\n", content) yield Document(content) - #return f"{self.source}\n{self.content}" + # return f"{self.source}\n{self.content}" diff --git a/graphrag_sdk/fixtures/regex.py b/graphrag_sdk/fixtures/regex.py index 3933692..759d12b 100644 --- a/graphrag_sdk/fixtures/regex.py +++ b/graphrag_sdk/fixtures/regex.py @@ -4,4 +4,4 @@ NODE_LABEL_REGEX = r"\(.+:(.*?)\)" -NODE_REGEX = r"\(.*?\)" \ No newline at end of file +NODE_REGEX = r"\(.*?\)" diff --git a/graphrag_sdk/helpers.py b/graphrag_sdk/helpers.py index 4f51697..8d2505e 100644 --- a/graphrag_sdk/helpers.py +++ b/graphrag_sdk/helpers.py @@ -77,9 +77,7 @@ def extract_cypher(text: str): return "".join(matches) -def validate_cypher( - cypher: str, ontology: graphrag_sdk.Ontology -) -> list[str] | None: +def validate_cypher(cypher: str, ontology: graphrag_sdk.Ontology) -> list[str] | None: try: if not cypher or len(cypher) == 0: return ["Cypher statement is empty"] @@ -126,10 +124,10 @@ def validate_cypher_relations_exist(cypher: str, ontology: graphrag_sdk.Ontology for relation in relation_labels: for label in relation.split("|"): max_idx = min( - label.index("*") if "*" in label else len(label), - label.index("{") if "{" in label else len(label), - label.index("]") if "]" in label else len(label), - ) + label.index("*") if "*" in label else len(label), + label.index("{") if "{" in label else len(label), + label.index("]") if "]" in label else len(label), + ) label = label[:max_idx] if label not in [relation.label for relation in ontology.relations]: not_found_relation_labels.append(label) @@ -139,9 +137,7 @@ def validate_cypher_relations_exist(cypher: str, ontology: graphrag_sdk.Ontology ] -def validate_cypher_relation_directions( - cypher: str, ontology: graphrag_sdk.Ontology -): +def validate_cypher_relation_directions(cypher: str, ontology: graphrag_sdk.Ontology): errors = [] relations = list(re.finditer(r"\[.*?\]", cypher)) @@ -215,4 +211,4 @@ def validate_cypher_relation_directions( except Exception: continue - return errors \ No newline at end of file + return errors diff --git a/graphrag_sdk/kg.py b/graphrag_sdk/kg.py index 206112a..138f8c0 100644 --- a/graphrag_sdk/kg.py +++ b/graphrag_sdk/kg.py @@ -9,8 +9,13 @@ from graphrag_sdk.helpers import map_dict_to_cypher_properties from graphrag_sdk.model_config import KnowledgeGraphModelConfig from graphrag_sdk.steps.extract_data_step import ExtractDataStep -from graphrag_sdk.fixtures.prompts import (GRAPH_QA_SYSTEM, CYPHER_GEN_SYSTEM, - CYPHER_GEN_PROMPT, GRAPH_QA_PROMPT, CYPHER_GEN_PROMPT_WITH_HISTORY) +from graphrag_sdk.fixtures.prompts import ( + GRAPH_QA_SYSTEM, + CYPHER_GEN_SYSTEM, + CYPHER_GEN_PROMPT, + GRAPH_QA_PROMPT, + CYPHER_GEN_PROMPT_WITH_HISTORY, +) logger = logging.getLogger(__name__) logger.setLevel(logging.DEBUG) @@ -70,7 +75,7 @@ def __init__( else: # save ontology to DB ontology.save_to_graph(ontology_graph) - + if ontology is None: raise Exception("Ontology is not defined") @@ -84,7 +89,10 @@ def __init__( cypher_system_instruction = CYPHER_GEN_SYSTEM else: if "{ontology}" not in cypher_system_instruction: - warnings.warn("Cypher system instruction should contain {ontology}", category=UserWarning) + warnings.warn( + "Cypher system instruction should contain {ontology}", + category=UserWarning, + ) if qa_system_instruction is None: qa_system_instruction = GRAPH_QA_SYSTEM @@ -107,9 +115,14 @@ def __init__( cypher_gen_prompt_history = CYPHER_GEN_PROMPT_WITH_HISTORY else: if "{question}" not in cypher_gen_prompt_history: - raise Exception("Cypher generation prompt with history should contain {question}") + raise Exception( + "Cypher generation prompt with history should contain {question}" + ) if "{last_answer}" not in cypher_gen_prompt_history: - warnings.warn("Cypher generation prompt with history should contain {last_answer}", category=UserWarning) + warnings.warn( + "Cypher generation prompt with history should contain {last_answer}", + category=UserWarning, + ) # Assign the validated values self.cypher_system_instruction = cypher_system_instruction @@ -147,7 +160,10 @@ def list_sources(self) -> list[AbstractSource]: return [s.source for s in self.sources] def process_sources( - self, sources: list[AbstractSource], instructions: str = None, hide_progress: bool = False + self, + sources: list[AbstractSource], + instructions: str = None, + hide_progress: bool = False, ) -> None: """ Add entities and relations found in sources into the knowledge-graph @@ -162,7 +178,9 @@ def process_sources( raise Exception("Ontology is not defined") # Create graph with sources - failed_sources = self._create_graph_with_sources(sources, instructions, hide_progress) + failed_sources = self._create_graph_with_sources( + sources, instructions, hide_progress + ) # Add processed sources for src in sources: @@ -173,7 +191,10 @@ def process_sources( self.failed_sources.add(src) def _create_graph_with_sources( - self, sources: list[AbstractSource] | None = None, instructions: str = None, hide_progress: bool = False + self, + sources: list[AbstractSource] | None = None, + instructions: str = None, + hide_progress: bool = False, ) -> list[AbstractSource]: step = ExtractDataStep( @@ -185,9 +206,9 @@ def _create_graph_with_sources( ) failed_sources = step.run(instructions) - + return failed_sources - + def delete(self) -> None: """ Deletes the knowledge graph and any other related resource @@ -205,9 +226,18 @@ def delete(self) -> None: setattr(self, key, None) def chat_session(self) -> ChatSession: - chat_session = ChatSession(self._model_config, self.ontology, self.graph, self.cypher_system_instruction, - self.qa_system_instruction, self.cypher_gen_prompt, self.qa_prompt, self.cypher_gen_prompt_history) + chat_session = ChatSession( + self._model_config, + self.ontology, + self.graph, + self.cypher_system_instruction, + self.qa_system_instruction, + self.cypher_gen_prompt, + self.qa_prompt, + self.cypher_gen_prompt_history, + ) return chat_session + def add_node(self, entity: str, attributes: dict): """ Add a node to the knowledge graph, checking if it matches the ontology diff --git a/graphrag_sdk/model_config.py b/graphrag_sdk/model_config.py index e1f0722..17876d0 100644 --- a/graphrag_sdk/model_config.py +++ b/graphrag_sdk/model_config.py @@ -47,7 +47,7 @@ def with_model(model: GenerativeModel): cypher_generation=model, qa=model, ) - + @staticmethod def from_json(json: dict) -> "KnowledgeGraphModelConfig": """ @@ -65,7 +65,7 @@ def from_json(json: dict) -> "KnowledgeGraphModelConfig": GenerativeModel.from_json(json["cypher_generation"]), GenerativeModel.from_json(json["qa"]), ) - + def to_json(self) -> dict: """ Converts the model configuration to a JSON dictionary. diff --git a/graphrag_sdk/models/__init__.py b/graphrag_sdk/models/__init__.py index ba10467..1032afe 100644 --- a/graphrag_sdk/models/__init__.py +++ b/graphrag_sdk/models/__init__.py @@ -13,4 +13,4 @@ "GenerativeModel", "GenerativeModelChatSession", "GenerativeModelConfig", -] \ No newline at end of file +] diff --git a/graphrag_sdk/models/azure_openai.py b/graphrag_sdk/models/azure_openai.py index 222e657..3757947 100644 --- a/graphrag_sdk/models/azure_openai.py +++ b/graphrag_sdk/models/azure_openai.py @@ -10,6 +10,7 @@ GenerativeModelChatSession, ) + class AzureOpenAiGenerativeModel(GenerativeModel): """ A generative model that interfaces with Azure's OpenAI API for chat completions. @@ -34,26 +35,26 @@ def __init__( self.model_name = model_name self.generation_config = generation_config or GenerativeModelConfig() self.system_instruction = system_instruction - + # Credentials self.api_key = os.getenv("AZURE_OPENAI_API_KEY") self.azure_endpoint = os.getenv("AZURE_ENDPOINT") self.api_version = os.getenv("AZURE_API_VERSION") - + if not self.api_key or not self.azure_endpoint or not self.api_version: raise ValueError( "Missing credentials in the environment: AZURE_OPENAI_API_KEY, AZURE_ENDPOINT, or AZURE_API_VERSION." ) - def _connect_to_model(self) -> None: """ Establish a connection to the Azure OpenAI model by initializing the AzureOpenAI client. """ - self.client = AzureOpenAI(azure_endpoint=self.azure_endpoint, - api_version=self.api_version, - api_key=self.api_key, - ) + self.client = AzureOpenAI( + azure_endpoint=self.azure_endpoint, + api_version=self.api_version, + api_key=self.api_key, + ) def with_system_instruction(self, system_instruction: str) -> "GenerativeModel": """ @@ -61,7 +62,7 @@ def with_system_instruction(self, system_instruction: str) -> "GenerativeModel": Args: system_instruction (str): System instructions for the model. - + Returns: GenerativeModel: The updated model instance. """ @@ -167,7 +168,6 @@ class AzureOpenAiChatSession(GenerativeModelChatSession): A chat session for interacting with the Azure OpenAI model, maintaining conversation history. """ - _history = [] def __init__(self, model: AzureOpenAiGenerativeModel, args: Optional[dict] = None): @@ -186,7 +186,9 @@ def __init__(self, model: AzureOpenAiGenerativeModel, args: Optional[dict] = Non else [] ) - def send_message(self, message: str, output_method: OutputMethod = OutputMethod.DEFAULT) -> GenerationResponse: + def send_message( + self, message: str, output_method: OutputMethod = OutputMethod.DEFAULT + ) -> GenerationResponse: """ Send a message in the chat session and receive the model's response. @@ -202,15 +204,13 @@ def send_message(self, message: str, output_method: OutputMethod = OutputMethod. prompt.extend(self._history) prompt.append({"role": "user", "content": message[:14385]}) response = self._model.client.chat.completions.create( - model=self._model.model_name, - messages=prompt, - **generation_config + model=self._model.model_name, messages=prompt, **generation_config ) content = self._model._parse_generate_content_response(response) self._history.append({"role": "user", "content": message}) self._history.append({"role": "assistant", "content": content.text}) return content - + def _get_generation_config(self, output_method: OutputMethod): """ Adjust the generation configuration based on the output method. @@ -223,16 +223,16 @@ def _get_generation_config(self, output_method: OutputMethod): """ config = self._model.generation_config.to_json() if output_method == OutputMethod.JSON: - config['temperature'] = 0 - config['response_format'] = { "type": "json_object" } - + config["temperature"] = 0 + config["response_format"] = {"type": "json_object"} + return config - + def delete_last_message(self): """ Deletes the last message exchange (user message and assistant response) from the chat history. Preserves the system message if present. - + Example: Before: [ @@ -244,7 +244,7 @@ def delete_last_message(self): [ {"role": "system", "content": "System message"}, ] - + Note: Does nothing if the chat history is empty or contains only a system message. """ # Keep at least the system message if present @@ -255,7 +255,7 @@ def delete_last_message(self): else: # Reset to initial state with just system message if present self._history = ( - [{"role": "system", "content": self._model.system_instruction}] - if self._model.system_instruction is not None - else [] - ) + [{"role": "system", "content": self._model.system_instruction}] + if self._model.system_instruction is not None + else [] + ) diff --git a/graphrag_sdk/models/gemini.py b/graphrag_sdk/models/gemini.py index f2b4f59..6748c54 100644 --- a/graphrag_sdk/models/gemini.py +++ b/graphrag_sdk/models/gemini.py @@ -13,7 +13,8 @@ GenerationConfig as GoogleGenerationConfig, configure, protos, - types,) + types, +) class GeminiGenerativeModel(GenerativeModel): @@ -31,7 +32,6 @@ def __init__( self._system_instruction = system_instruction configure(api_key=os.environ["GOOGLE_API_KEY"]) - def _get_model(self) -> GoogleGenerativeModel: if self._model is None: self._model = GoogleGenerativeModel( @@ -73,7 +73,8 @@ def parse_generate_content_response( == protos.Candidate.FinishReason.MAX_TOKENS else ( FinishReason.STOP - if response.candidates[0].finish_reason == protos.Candidate.FinishReason.STOP + if response.candidates[0].finish_reason + == protos.Candidate.FinishReason.STOP else FinishReason.OTHER ) ), @@ -105,24 +106,25 @@ def __init__(self, model: GeminiGenerativeModel, args: dict | None = None): history=args.get("history", []) if args is not None else [], ) - def send_message(self, message: str, output_method: OutputMethod = OutputMethod.DEFAULT) -> GenerationResponse: + def send_message( + self, message: str, output_method: OutputMethod = OutputMethod.DEFAULT + ) -> GenerationResponse: generation_config = self._get_generation_config(output_method) - response = self._chat_session.send_message(message, generation_config=generation_config) + response = self._chat_session.send_message( + message, generation_config=generation_config + ) return self._model.parse_generate_content_response(response) - + def _get_generation_config(self, output_method: OutputMethod): if output_method == OutputMethod.JSON: - return { - "response_mime_type": "application/json", - "temperature": 0 - } + return {"response_mime_type": "application/json", "temperature": 0} return self._model._generation_config - + def delete_last_message(self): """ Deletes the last message exchange (user message and assistant response) from the chat history. Preserves the system message if present. - + Example: Before: [ @@ -139,4 +141,3 @@ def delete_last_message(self): self._chat_session.history.pop() else: self._chat_session.history = [] - diff --git a/graphrag_sdk/models/litellm.py b/graphrag_sdk/models/litellm.py index 92cd960..f137ccc 100644 --- a/graphrag_sdk/models/litellm.py +++ b/graphrag_sdk/models/litellm.py @@ -12,7 +12,8 @@ ) logger = logging.getLogger(__name__) -logger.setLevel(logging.INFO) +logger.setLevel(logging.INFO) + class LiteModel(GenerativeModel): """ @@ -27,7 +28,7 @@ def __init__( ): """ Initialize the LiteModel with the required parameters. - + LiteLLM model_name format: / Examples: - openai/gpt-4o @@ -41,23 +42,21 @@ def __init__( system_instruction (Optional[str]): Instruction to guide the model. """ - env_val = validate_environment(model_name) - if not env_val['keys_in_environment']: + if not env_val["keys_in_environment"]: raise ValueError(f"Missing {env_val['missing_keys']} in the environment.") self.model_name, provider, _, _ = litellm_utils.get_llm_provider(model_name) self.model = model_name - + if provider == "ollama": self.ollama_client = Client() self.check_and_pull_model() if not self.check_valid_key(model_name): raise ValueError(f"Invalid keys for model {model_name}.") - self.generation_config = generation_config or GenerativeModelConfig() self.system_instruction = system_instruction - + def check_valid_key(self, model: str): """ Checks if the environment key is valid for a specific model by making a litellm.completion call with max_tokens=10 @@ -70,13 +69,11 @@ def check_valid_key(self, model: str): """ messages = [{"role": "user", "content": "Hey, how's it going?"}] try: - completion( - model=model, messages=messages, max_tokens=10 - ) + completion(model=model, messages=messages, max_tokens=10) return True except: # noqa: E722 return False - + def check_and_pull_model(self) -> None: """ Checks if the specified model is available locally, and pulls it if not. @@ -90,7 +87,9 @@ def check_and_pull_model(self) -> None: """ # Get the list of available models response = self.ollama_client.list() # This returns a dictionary - available_models = [model['name'] for model in response['models']] # Extract model names + available_models = [ + model["name"] for model in response["models"] + ] # Extract model names # Check if the model is already pulled if self.model_name in available_models: @@ -110,7 +109,7 @@ def with_system_instruction(self, system_instruction: str) -> "GenerativeModel": Args: system_instruction (str): Instruction for guiding the model's behavior. - + Returns: GenerativeModel: The updated model instance. """ @@ -205,7 +204,7 @@ def __init__(self, model: LiteModel, args: Optional[dict] = None): if self._model.system_instruction is not None else [] ) - + def get_chat_history(self) -> list[dict]: """ Retrieve the conversation history for the current chat session. @@ -215,7 +214,9 @@ def get_chat_history(self) -> list[dict]: """ return self._chat_history.copy() - def send_message(self, message: str, output_method: OutputMethod = OutputMethod.DEFAULT) -> GenerationResponse: + def send_message( + self, message: str, output_method: OutputMethod = OutputMethod.DEFAULT + ) -> GenerationResponse: """ Send a message in the chat session and receive the model's response. @@ -232,14 +233,16 @@ def send_message(self, message: str, output_method: OutputMethod = OutputMethod. response = completion( model=self._model.model, messages=self._chat_history, - **generation_config + **generation_config, ) except Exception as e: - raise ValueError(f"Error during completion request, please check the credentials - {e}") + raise ValueError( + f"Error during completion request, please check the credentials - {e}" + ) content = self._model.parse_generate_content_response(response) self._chat_history.append({"role": "assistant", "content": content.text}) return content - + def _adjust_generation_config(self, output_method: OutputMethod): """ Adjust the generation configuration based on the specified output method. @@ -252,16 +255,16 @@ def _adjust_generation_config(self, output_method: OutputMethod): """ config = self._model.generation_config.to_json() if output_method == OutputMethod.JSON: - config['temperature'] = 0 - config['response_format'] = { "type": "json_object" } - + config["temperature"] = 0 + config["response_format"] = {"type": "json_object"} + return config - + def delete_last_message(self): """ Deletes the last message exchange (user message and assistant response) from the chat history. Preserves the system message if present. - + Example: Before: [ @@ -284,7 +287,7 @@ def delete_last_message(self): else: # Reset to initial state with just system message if present self._chat_history = ( - [{"role": "system", "content": self._model.system_instruction}] - if self._model.system_instruction is not None - else [] - ) + [{"role": "system", "content": self._model.system_instruction}] + if self._model.system_instruction is not None + else [] + ) diff --git a/graphrag_sdk/models/model.py b/graphrag_sdk/models/model.py index 4e665b6..41da684 100644 --- a/graphrag_sdk/models/model.py +++ b/graphrag_sdk/models/model.py @@ -7,9 +7,11 @@ class FinishReason: STOP = "STOP" OTHER = "OTHER" + class OutputMethod(Enum): - JSON = 'json' - DEFAULT = 'default' + JSON = "json" + DEFAULT = "default" + class GenerativeModelConfig: """ @@ -89,7 +91,9 @@ def __init__(self, model: "GenerativeModel"): self.model = model @abstractmethod - def send_message(self, message: str, output_method: OutputMethod = OutputMethod.DEFAULT) -> GenerationResponse: + def send_message( + self, message: str, output_method: OutputMethod = OutputMethod.DEFAULT + ) -> GenerationResponse: pass diff --git a/graphrag_sdk/models/ollama.py b/graphrag_sdk/models/ollama.py index b053067..3b481fb 100644 --- a/graphrag_sdk/models/ollama.py +++ b/graphrag_sdk/models/ollama.py @@ -11,7 +11,8 @@ ) logger = logging.getLogger(__name__) -logger.setLevel(logging.INFO) +logger.setLevel(logging.INFO) + class OllamaGenerativeModel(GenerativeModel): """ @@ -53,7 +54,7 @@ def with_system_instruction(self, system_instruction: str) -> "GenerativeModel": Args: system_instruction (str): Instruction for guiding the model's behavior. - + Returns: GenerativeModel: The updated model instance. """ @@ -76,7 +77,9 @@ def check_and_pull_model(self) -> None: """ # Get the list of available models response = self.client.list() # This returns a dictionary - available_models = [model['name'] for model in response['models']] # Extract model names + available_models = [ + model["name"] for model in response["models"] + ] # Extract model names # Check if the model is already pulled if self.model_name in available_models: @@ -88,7 +91,7 @@ def check_and_pull_model(self) -> None: logger.info(f"Model '{self.model_name}' pulled successfully.") except Exception as e: logger.error(f"Failed to pull the model '{self.model_name}': {e}") - + def start_chat(self, args: Optional[dict] = None) -> GenerativeModelChatSession: """ Start a new chat session. @@ -112,9 +115,8 @@ def _parse_generate_content_response(self, response: any) -> GenerationResponse: GenerationResponse: Parsed response containing the generated text. """ return GenerationResponse( - text=response["message"]["content"], - finish_reason=FinishReason.STOP - ) + text=response["message"]["content"], finish_reason=FinishReason.STOP + ) def to_json(self) -> dict: """ @@ -148,11 +150,12 @@ def from_json(json: dict) -> "GenerativeModel": system_instruction=json["system_instruction"], ) + class OllamaChatSession(GenerativeModelChatSession): """ A chat session for interacting with the Ollama model, maintaining conversation history. """ - + def __init__(self, model: OllamaGenerativeModel, args: Optional[dict] = None): """ Initialize the chat session and set up the conversation history. @@ -168,7 +171,7 @@ def __init__(self, model: OllamaGenerativeModel, args: Optional[dict] = None): if self._model.system_instruction is not None else [] ) - + def get_chat_history(self) -> list[dict]: """ Retrieve the conversation history for the current chat session. @@ -178,7 +181,9 @@ def get_chat_history(self) -> list[dict]: """ return self._chat_history.copy() - def send_message(self, message: str, output_method: OutputMethod = OutputMethod.DEFAULT) -> GenerationResponse: + def send_message( + self, message: str, output_method: OutputMethod = OutputMethod.DEFAULT + ) -> GenerationResponse: """ Send a message in the chat session and receive the model's response. @@ -194,12 +199,12 @@ def send_message(self, message: str, output_method: OutputMethod = OutputMethod. response = self._model.client.chat( model=self._model.model_name, messages=self._chat_history, - options=Options(**generation_config) + options=Options(**generation_config), ) content = self._model._parse_generate_content_response(response) self._chat_history.append({"role": "assistant", "content": content.text}) return content - + def _adjust_generation_config(self, output_method: OutputMethod) -> dict: """ Adjust the generation configuration based on the specified output method. @@ -212,16 +217,16 @@ def _adjust_generation_config(self, output_method: OutputMethod) -> dict: """ config = self._model.generation_config.to_json() if output_method == OutputMethod.JSON: - config['temperature'] = 0 - config['format'] = 'json' - + config["temperature"] = 0 + config["format"] = "json" + return config - + def delete_last_message(self): """ Deletes the last message exchange (user message and assistant response) from the chat history. Preserves the system message if present. - + Example: Before: [ @@ -244,7 +249,7 @@ def delete_last_message(self): else: # Reset to initial state with just system message if present self._chat_history = ( - [{"role": "system", "content": self._model.system_instruction}] - if self._model.system_instruction is not None - else [] - ) \ No newline at end of file + [{"role": "system", "content": self._model.system_instruction}] + if self._model.system_instruction is not None + else [] + ) diff --git a/graphrag_sdk/models/openai.py b/graphrag_sdk/models/openai.py index 20f4ad1..cbda2c2 100644 --- a/graphrag_sdk/models/openai.py +++ b/graphrag_sdk/models/openai.py @@ -84,34 +84,34 @@ def __init__(self, model: OpenAiGenerativeModel, args: dict | None = None): else [] ) - def send_message(self, message: str, output_method: OutputMethod = OutputMethod.DEFAULT) -> GenerationResponse: + def send_message( + self, message: str, output_method: OutputMethod = OutputMethod.DEFAULT + ) -> GenerationResponse: generation_config = self._get_generation_config(output_method) prompt = [] prompt.extend(self._history) prompt.append({"role": "user", "content": message[:14385]}) response = self._model.client.chat.completions.create( - model=self._model.model_name, - messages=prompt, - **generation_config + model=self._model.model_name, messages=prompt, **generation_config ) content = self._model.parse_generate_content_response(response) self._history.append({"role": "user", "content": message}) self._history.append({"role": "assistant", "content": content.text}) return content - + def _get_generation_config(self, output_method: OutputMethod): config = self._model.generation_config.to_json() if output_method == OutputMethod.JSON: - config['temperature'] = 0 - config['response_format'] = { "type": "json_object" } - + config["temperature"] = 0 + config["response_format"] = {"type": "json_object"} + return config - + def delete_last_message(self): """ Deletes the last message exchange (user message and assistant response) from the chat history. Preserves the system message if present. - + Example: Before: [ @@ -134,7 +134,7 @@ def delete_last_message(self): else: # Reset to initial state with just system message if present self._history = ( - [{"role": "system", "content": self._model.system_instruction}] - if self._model.system_instruction is not None - else [] - ) + [{"role": "system", "content": self._model.system_instruction}] + if self._model.system_instruction is not None + else [] + ) diff --git a/graphrag_sdk/orchestrator/__init__.py b/graphrag_sdk/orchestrator/__init__.py index c0a0dd4..25372e6 100644 --- a/graphrag_sdk/orchestrator/__init__.py +++ b/graphrag_sdk/orchestrator/__init__.py @@ -2,8 +2,4 @@ from .orchestrator_runner import OrchestratorRunner from .execution_plan import ExecutionPlan -__all__ = [ - 'Orchestrator', - 'ExecutionPlan', - 'OrchestratorRunner' -] +__all__ = ["Orchestrator", "ExecutionPlan", "OrchestratorRunner"] diff --git a/graphrag_sdk/orchestrator/orchestrator.py b/graphrag_sdk/orchestrator/orchestrator.py index 791676c..cd3cf54 100644 --- a/graphrag_sdk/orchestrator/orchestrator.py +++ b/graphrag_sdk/orchestrator/orchestrator.py @@ -21,7 +21,7 @@ def __init__(self, model: GenerativeModel, backstory: str = ""): self._backstory = backstory self._agents = [] self._chat = None - + def _get_chat(self): if self._chat is None: self._chat = self._model.with_system_instruction( diff --git a/graphrag_sdk/orchestrator/step.py b/graphrag_sdk/orchestrator/step.py index a707f02..e14ea7e 100644 --- a/graphrag_sdk/orchestrator/step.py +++ b/graphrag_sdk/orchestrator/step.py @@ -2,6 +2,7 @@ from .step_result import StepResult from json import loads + class StepBlockType: PARALLEL = "parallel" AGENT = "agent" @@ -40,15 +41,16 @@ def properties(self) -> any: pass @staticmethod - def from_json(json: dict| str) -> "PlanStep": - json = json if isinstance(json, dict) else loads(json) + def from_json(json: dict | str) -> "PlanStep": + json = json if isinstance(json, dict) else loads(json) from graphrag_sdk.orchestrator.steps import PLAN_STEP_TYPE_MAP + block = StepBlockType.from_str(json["block"]) step_type = PLAN_STEP_TYPE_MAP[block] if step_type is None: raise ValueError(f"Unknown step block type: {block}") - + return step_type.from_json(json) @abstractmethod diff --git a/graphrag_sdk/orchestrator/step_result.py b/graphrag_sdk/orchestrator/step_result.py index 575b4b0..d077403 100644 --- a/graphrag_sdk/orchestrator/step_result.py +++ b/graphrag_sdk/orchestrator/step_result.py @@ -1,5 +1,6 @@ from abc import ABC, abstractmethod + class StepResult(ABC): @property diff --git a/graphrag_sdk/orchestrator/steps/__init__.py b/graphrag_sdk/orchestrator/steps/__init__.py index 3197453..3fe75e4 100644 --- a/graphrag_sdk/orchestrator/steps/__init__.py +++ b/graphrag_sdk/orchestrator/steps/__init__.py @@ -17,5 +17,5 @@ "ParallelStep", "SummaryStep", "UserInputStep", - "PLAN_STEP_TYPE_MAP" + "PLAN_STEP_TYPE_MAP", ] diff --git a/graphrag_sdk/orchestrator/steps/agent.py b/graphrag_sdk/orchestrator/steps/agent.py index 65172a0..bb48d1c 100644 --- a/graphrag_sdk/orchestrator/steps/agent.py +++ b/graphrag_sdk/orchestrator/steps/agent.py @@ -105,7 +105,9 @@ def run( self, runner: "OrchestratorRunner", ) -> AgentStepResult: - logger.info(f"Running agent {self.properties.agent_id}, step: {self.id}, payload: {self.properties.payload}") + logger.info( + f"Running agent {self.properties.agent_id}, step: {self.id}, payload: {self.properties.payload}" + ) agent = runner.get_agent(self.properties.agent_id) if agent is None: diff --git a/graphrag_sdk/orchestrator/steps/parallel.py b/graphrag_sdk/orchestrator/steps/parallel.py index 3763fca..00ac663 100644 --- a/graphrag_sdk/orchestrator/steps/parallel.py +++ b/graphrag_sdk/orchestrator/steps/parallel.py @@ -17,10 +17,7 @@ def to_json(self) -> dict: @staticmethod def from_json(json: dict) -> "ParallelStepResult": return ParallelStepResult( - [ - StepResult.from_json(result) - for result in json["results"] - ] + [StepResult.from_json(result) for result in json["results"]] ) def __str__(self) -> str: @@ -51,10 +48,10 @@ def from_json(json: dict) -> "ParallelProperties": def to_json(self) -> dict: return {"steps": [step.to_json() for step in self.steps]} - + def __str__(self) -> str: return f"ParallelProperties(steps={self.steps})" - + def __repr__(self) -> str: return str(self) diff --git a/graphrag_sdk/orchestrator/steps/user_input.py b/graphrag_sdk/orchestrator/steps/user_input.py index b3c5c7d..0ecaaec 100644 --- a/graphrag_sdk/orchestrator/steps/user_input.py +++ b/graphrag_sdk/orchestrator/steps/user_input.py @@ -48,10 +48,10 @@ def to_json(self) -> dict: return { "question": self.question, } - + def __str__(self) -> str: return f"UserInputProperties(question={self.question})" - + def __repr__(self) -> str: return str(self) diff --git a/graphrag_sdk/relation.py b/graphrag_sdk/relation.py index 9a361fa..0358bd9 100644 --- a/graphrag_sdk/relation.py +++ b/graphrag_sdk/relation.py @@ -59,9 +59,9 @@ def to_json(self): def __str__(self) -> str: """ Returns a string representation of the Relation object. - + The string representation includes the label of the Relation object. - + Returns: str: The string representation of the Relation object. """ diff --git a/graphrag_sdk/steps/create_ontology_step.py b/graphrag_sdk/steps/create_ontology_step.py index 2d52352..8c70d05 100644 --- a/graphrag_sdk/steps/create_ontology_step.py +++ b/graphrag_sdk/steps/create_ontology_step.py @@ -23,6 +23,7 @@ FIX_JSON_PROMPT, BOUNDARIES_PREFIX, ) + RENDER_STEP_SIZE = 0.5 @@ -61,7 +62,11 @@ def _create_chat(self): def run(self, boundaries: Optional[str] = None): tasks: list[Future[Ontology]] = [] - with tqdm(total=len(self.sources) + 1, desc="Process Documents", disable=self.hide_progress) as pbar: + with tqdm( + total=len(self.sources) + 1, + desc="Process Documents", + disable=self.hide_progress, + ) as pbar: with ThreadPoolExecutor(max_workers=self.config["max_workers"]) as executor: # Process each source document in parallel @@ -81,14 +86,16 @@ def run(self, boundaries: Optional[str] = None): with self.counter_lock: pbar.n = self.process_files pbar.refresh() - + # Validate the ontology if len(self.ontology.entities) == 0: raise Exception("Failed to create ontology") - + # Finalize the ontology - task_fin = executor.submit(self._fix_ontology, self._create_chat(), self.ontology) - + task_fin = executor.submit( + self._fix_ontology, self._create_chat(), self.ontology + ) + # Wait for the final task to be completed while not task_fin.done(): time.sleep(RENDER_STEP_SIZE) @@ -107,12 +114,16 @@ def _process_source( ): try: document = next(source.load()) - + text = document.content[: self.config["max_input_tokens"]] user_message = CREATE_ONTOLOGY_PROMPT.format( - text = text, - boundaries = BOUNDARIES_PREFIX.format(user_boundaries=boundaries) if boundaries is not None else "", + text=text, + boundaries=( + BOUNDARIES_PREFIX.format(user_boundaries=boundaries) + if boundaries is not None + else "" + ), ) responses: list[GenerationResponse] = [] @@ -122,7 +133,10 @@ def _process_source( logger.debug(f"Model response: {responses[response_idx]}") - while responses[response_idx].finish_reason == FinishReason.MAX_TOKENS and response_idx < retries: + while ( + responses[response_idx].finish_reason == FinishReason.MAX_TOKENS + and response_idx < retries + ): response_idx += 1 responses.append(self._call_model(chat_session, "continue")) @@ -209,7 +223,7 @@ def _fix_ontology(self, chat_session: GenerativeModelChatSession, o: Ontology): if data is None: return o - + try: new_ontology = Ontology.from_json(data) except Exception as e: diff --git a/graphrag_sdk/steps/extract_data_step.py b/graphrag_sdk/steps/extract_data_step.py index 093c82b..8447583 100644 --- a/graphrag_sdk/steps/extract_data_step.py +++ b/graphrag_sdk/steps/extract_data_step.py @@ -69,8 +69,12 @@ def _create_chat(self): def run(self, instructions: str = None) -> list[AbstractSource]: tasks: list[Future[Ontology]] = [] - - with tqdm(total=len(self.sources), desc="Process Documents", disable=self.hide_progress) as pbar: + + with tqdm( + total=len(self.sources), + desc="Process Documents", + disable=self.hide_progress, + ) as pbar: with ThreadPoolExecutor(max_workers=self.config["max_workers"]) as executor: # Process each source document in parallel @@ -86,7 +90,7 @@ def run(self, instructions: str = None) -> list[AbstractSource]: instructions, ) tasks.append(task) - + # Wait for all tasks to be completed while any(task.running() or not task.done() for task in tasks): time.sleep(RENDER_STEP_SIZE) @@ -94,7 +98,9 @@ def run(self, instructions: str = None) -> list[AbstractSource]: pbar.n = self.process_files pbar.refresh() - failed_sources = [self.sources[idx] for idx, task in enumerate(tasks) if task.exception()] + failed_sources = [ + self.sources[idx] for idx, task in enumerate(tasks) if task.exception() + ] return failed_sources def _process_source( @@ -124,10 +130,10 @@ def _process_source( logger.debug(f"Processing task: {task_id}") _task_logger.debug(f"Processing task: {task_id}") - + document = next(source.load()) source_instructions = source.instruction - + text = document.content[: self.config["max_input_tokens"]] user_message = EXTRACT_DATA_PROMPT.format( text=text, @@ -146,14 +152,27 @@ def _process_source( responses: list[GenerationResponse] = [] response_idx = 0 - responses.append(self._call_model(chat_session, user_message, output_method=OutputMethod.JSON)) + responses.append( + self._call_model( + chat_session, user_message, output_method=OutputMethod.JSON + ) + ) _task_logger.debug(f"Model response: {responses[response_idx].text}") - while responses[response_idx].finish_reason == FinishReason.MAX_TOKENS and response_idx < retries: + while ( + responses[response_idx].finish_reason == FinishReason.MAX_TOKENS + and response_idx < retries + ): _task_logger.debug("Asking model to continue") response_idx += 1 - responses.append(self._call_model(chat_session, COMPLETE_DATA_EXTRACTION, output_method=OutputMethod.JSON)) + responses.append( + self._call_model( + chat_session, + COMPLETE_DATA_EXTRACTION, + output_method=OutputMethod.JSON, + ) + ) _task_logger.debug( f"Model response after continue: {responses[response_idx].text}" ) @@ -202,7 +221,7 @@ def _process_source( except Exception as e: _task_logger.error(f"Error creating relation: {e}") continue - + except Exception as e: logger.exception(f"Task id: {task_id} failed - {e}") raise e @@ -293,7 +312,7 @@ def _call_model( chat_session: GenerativeModelChatSession, prompt: str, retry: int = 6, - output_method: OutputMethod = OutputMethod.DEFAULT + output_method: OutputMethod = OutputMethod.DEFAULT, ): try: return chat_session.send_message(prompt, output_method=output_method) diff --git a/graphrag_sdk/steps/graph_query_step.py b/graphrag_sdk/steps/graph_query_step.py index a9ac8bb..61e5113 100644 --- a/graphrag_sdk/steps/graph_query_step.py +++ b/graphrag_sdk/steps/graph_query_step.py @@ -43,10 +43,12 @@ def run(self, question: str, retries: int = 10): for i in range(retries): try: cypher_prompt = ( - (self.cypher_prompt.format(question=question) + self.cypher_prompt.format(question=question) if self.last_answer is None - else self.cypher_prompt_with_history.format(question=question, last_answer=self.last_answer)) - ) + else self.cypher_prompt_with_history.format( + question=question, last_answer=self.last_answer + ) + ) logger.debug(f"Cypher Prompt: {cypher_prompt}") cypher_statement_response = self.chat_session.send_message( cypher_prompt, diff --git a/tests/test_auto_create_ontology.py b/tests/test_auto_create_ontology.py index 4a9ec6d..876db83 100644 --- a/tests/test_auto_create_ontology.py +++ b/tests/test_auto_create_ontology.py @@ -1,4 +1,5 @@ from dotenv import load_dotenv + load_dotenv() from graphrag_sdk.ontology import Ontology import unittest diff --git a/tests/test_helper_validate_cypher.py b/tests/test_helper_validate_cypher.py index 85429d3..6a98522 100644 --- a/tests/test_helper_validate_cypher.py +++ b/tests/test_helper_validate_cypher.py @@ -80,7 +80,7 @@ def test_validate_cypher(self): class TestValidateCypher2(unittest.TestCase): """ - Test a cypher query with the wrong relation direction + Test a cypher query with the wrong relation direction """ cypher = """ diff --git a/tests/test_kg_gemini.py b/tests/test_kg_gemini.py index cbfdf2b..d65ba93 100644 --- a/tests/test_kg_gemini.py +++ b/tests/test_kg_gemini.py @@ -88,14 +88,14 @@ def test_kg_creation(self): sources = [Source(file_path)] self.kg.process_sources(sources) - + chat = self.kg.chat_session() answer = chat.send_message("How many actors acted in a movie?") - answer = answer['response'] + answer = answer["response"] logger.info(f"Answer: {answer}") - actors_count = re.findall(r'\d+', answer) + actors_count = re.findall(r"\d+", answer) num_actors = 0 if len(actors_count) == 0 else int(actors_count[0]) assert num_actors > 10, "The number of actors found should be greater than 10" diff --git a/tests/test_kg_litellm_openai.py b/tests/test_kg_litellm_openai.py index 2ec80f4..2482849 100644 --- a/tests/test_kg_litellm_openai.py +++ b/tests/test_kg_litellm_openai.py @@ -16,6 +16,7 @@ logging.basicConfig(level=logging.DEBUG) logger = logging.getLogger(__name__) + class TestKGLiteLLM(unittest.TestCase): """ Test Knowledge Graph @@ -85,11 +86,11 @@ def test_kg_creation(self): chat = self.kg.chat_session() answer = chat.send_message("How many actors acted in a movie?") - answer = answer['response'] + answer = answer["response"] logger.info(f"Answer: {answer}") - actors_count = re.findall(r'\d+', answer) + actors_count = re.findall(r"\d+", answer) num_actors = 0 if len(actors_count) == 0 else int(actors_count[0]) - assert num_actors > 10, "The number of actors found should be greater than 10" \ No newline at end of file + assert num_actors > 10, "The number of actors found should be greater than 10" diff --git a/tests/test_kg_ollama.py b/tests/test_kg_ollama.py index 06ec03e..5b3992f 100644 --- a/tests/test_kg_ollama.py +++ b/tests/test_kg_ollama.py @@ -10,7 +10,11 @@ from graphrag_sdk.attribute import Attribute, AttributeType from graphrag_sdk.models.ollama import OllamaGenerativeModel from graphrag_sdk.models.openai import OpenAiGenerativeModel -from graphrag_sdk import KnowledgeGraph, KnowledgeGraphModelConfig, GenerativeModelConfig +from graphrag_sdk import ( + KnowledgeGraph, + KnowledgeGraphModelConfig, + GenerativeModelConfig, +) load_dotenv() @@ -18,6 +22,7 @@ logging.basicConfig(level=logging.DEBUG) logger = logging.getLogger(__name__) + class TestKGOllama(unittest.TestCase): """ Test Knowledge Graph @@ -72,13 +77,20 @@ def setUpClass(cls): cls.graph_name = "IMDB_ollama" - model_ollama = OllamaGenerativeModel(model_name="llama3:8b", generation_config=GenerativeModelConfig(temperature=0)) + model_ollama = OllamaGenerativeModel( + model_name="llama3:8b", + generation_config=GenerativeModelConfig(temperature=0), + ) model_openai = OpenAiGenerativeModel(model_name="gpt-3.5-turbo") cls.kg = KnowledgeGraph( name=cls.graph_name, ontology=cls.ontology, - model_config=KnowledgeGraphModelConfig(extract_data=model_openai, cypher_generation=model_ollama, qa=model_ollama), + model_config=KnowledgeGraphModelConfig( + extract_data=model_openai, + cypher_generation=model_ollama, + qa=model_ollama, + ), ) def test_kg_creation(self): @@ -91,11 +103,11 @@ def test_kg_creation(self): chat = self.kg.chat_session() answer = chat.send_message("How many actors acted in a movie?") - answer = answer['response'] + answer = answer["response"] logger.info(f"Answer: {answer}") - actors_count = re.findall(r'\d+', answer) + actors_count = re.findall(r"\d+", answer) num_actors = 0 if len(actors_count) == 0 else int(actors_count[0]) assert num_actors > 5, "The number of actors found should be greater than 5" diff --git a/tests/test_kg_openai.py b/tests/test_kg_openai.py index 785a28d..c496c09 100644 --- a/tests/test_kg_openai.py +++ b/tests/test_kg_openai.py @@ -16,6 +16,7 @@ logging.basicConfig(level=logging.DEBUG) logger = logging.getLogger(__name__) + class TestKGOpenAI(unittest.TestCase): """ Test Knowledge Graph @@ -85,11 +86,11 @@ def test_kg_creation(self): chat = self.kg.chat_session() answer = chat.send_message("How many actors acted in a movie?") - answer = answer['response'] + answer = answer["response"] logger.info(f"Answer: {answer}") - actors_count = re.findall(r'\d+', answer) + actors_count = re.findall(r"\d+", answer) num_actors = 0 if len(actors_count) == 0 else int(actors_count[0]) assert num_actors > 10, "The number of actors found should be greater than 10" diff --git a/tests/test_multi_agent.py b/tests/test_multi_agent.py index 02ae597..f320396 100644 --- a/tests/test_multi_agent.py +++ b/tests/test_multi_agent.py @@ -314,7 +314,6 @@ def test_multi_agent(self): print(response) assert response is not None - assert ( "itinerary" in response.output.lower() or "day" in response.output.lower() ), f"Response should contain the 'itinerary' or 'day' string: {response.output}" From f4f7c6a4e8d53cb1df733362e7345e7bd10ff862 Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Sat, 11 Jan 2025 20:18:29 +0200 Subject: [PATCH 4/6] update black verison --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 339c796..d9d9e32 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,7 +33,7 @@ jobs: with: python-version: 3.x # Update with desired Python version - - uses: datadog/action-py-black-formatter@v2.1 + - uses: datadog/action-py-black-formatter@v2.5 with: check_mode: "true" From 52c3c4313e1e41b5bb339ed50c7e9d6309fbaaa5 Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Sat, 11 Jan 2025 20:41:16 +0200 Subject: [PATCH 5/6] fix format --- .github/workflows/test.yml | 15 +-- examples/movies/demo-movies.ipynb | 24 ++-- examples/trip/demo_orchestrator_trip.ipynb | 24 +++- graphrag_sdk/attribute.py | 2 +- graphrag_sdk/document_loaders/csv.py | 3 +- graphrag_sdk/document_loaders/pdf.py | 2 +- graphrag_sdk/helpers.py | 2 - graphrag_sdk/kg.py | 1 - graphrag_sdk/models/gemini.py | 2 - graphrag_sdk/models/model.py | 1 - graphrag_sdk/models/openai.py | 2 - graphrag_sdk/ontology.py | 2 +- graphrag_sdk/orchestrator/execution_plan.py | 1 - graphrag_sdk/orchestrator/orchestrator.py | 1 - .../orchestrator/orchestrator_runner.py | 3 - graphrag_sdk/orchestrator/step.py | 1 - graphrag_sdk/orchestrator/step_result.py | 1 - graphrag_sdk/orchestrator/steps/agent.py | 3 - graphrag_sdk/orchestrator/steps/parallel.py | 1 - graphrag_sdk/orchestrator/steps/summary.py | 2 - graphrag_sdk/orchestrator/steps/user_input.py | 3 - graphrag_sdk/steps/Step.py | 1 - graphrag_sdk/steps/create_ontology_step.py | 1 - graphrag_sdk/steps/extract_data_step.py | 2 - poetry.lock | 111 ++++++++++++++++-- pyproject.toml | 2 + tests/test_auto_create_ontology.py | 1 - tests/test_helper_validate_cypher.py | 12 -- tests/test_kg.py | 1 - tests/test_kg_gemini.py | 1 - tests/test_kg_litellm_openai.py | 3 - tests/test_kg_ollama.py | 3 - tests/test_kg_openai.py | 2 - tests/test_multi_agent.py | 3 - 34 files changed, 148 insertions(+), 91 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d9d9e32..14b26cf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,15 +32,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: 3.x # Update with desired Python version - - - uses: datadog/action-py-black-formatter@v2.5 - with: - check_mode: "true" - - - uses: astral-sh/ruff-action@v3 - with: - src: >- - "./graphrag_sdk" - name: Cache Poetry virtualenv id: cache @@ -69,6 +60,12 @@ jobs: - name: Install dependencies run: poetry install --extras "all" + - name: Run Lint + run: | + poetry run ruff check ./graphrag_sdk/ + poetry run ruff format --check ./graphrag_sdk/ + poetry run black ./graphrag_sdk/ --check + - name: Wait for Ollama to be ready run: | until curl -s http://localhost:11434; do diff --git a/examples/movies/demo-movies.ipynb b/examples/movies/demo-movies.ipynb index 276d84c..f7299c4 100644 --- a/examples/movies/demo-movies.ipynb +++ b/examples/movies/demo-movies.ipynb @@ -34,7 +34,7 @@ "\n", "# Load environment variables\n", "load_dotenv()\n", - "logging.disable(logging.CRITICAL)\n" + "logging.disable(logging.CRITICAL)" ] }, { @@ -57,7 +57,7 @@ "falkor_host = \"\"\n", "falkor_port = None\n", "falkor_username = \"\"\n", - "falkor_password = \"\"\n" + "falkor_password = \"\"" ] }, { @@ -75,12 +75,14 @@ "metadata": {}, "outputs": [], "source": [ - "urls = [\"https://www.rottentomatoes.com/m/side_by_side_2012\",\n", - "\"https://www.rottentomatoes.com/m/matrix\",\n", - "\"https://www.rottentomatoes.com/m/matrix_revolutions\",\n", - "\"https://www.rottentomatoes.com/m/matrix_reloaded\",\n", - "\"https://www.rottentomatoes.com/m/speed_1994\",\n", - "\"https://www.rottentomatoes.com/m/john_wick_chapter_4\"]\n", + "urls = [\n", + " \"https://www.rottentomatoes.com/m/side_by_side_2012\",\n", + " \"https://www.rottentomatoes.com/m/matrix\",\n", + " \"https://www.rottentomatoes.com/m/matrix_revolutions\",\n", + " \"https://www.rottentomatoes.com/m/matrix_reloaded\",\n", + " \"https://www.rottentomatoes.com/m/speed_1994\",\n", + " \"https://www.rottentomatoes.com/m/john_wick_chapter_4\",\n", + "]\n", "\n", "sources = [URL(url) for url in urls]" ] @@ -136,7 +138,7 @@ " host=falkor_host,\n", " port=falkor_port,\n", " username=falkor_username,\n", - " password=falkor_password\n", + " password=falkor_password,\n", ")\n", "kg.process_sources(sources)" ] @@ -190,7 +192,9 @@ "answer = chat.send_message(\"Who is the director of the movie Side by Side?\")\n", "print(f\"Q: {answer['question']} \\nA: {answer['response']}\\n\")\n", "\n", - "answer = chat.send_message(\"Order the directors that you mentioned in all of our conversation by lexical order.\")\n", + "answer = chat.send_message(\n", + " \"Order the directors that you mentioned in all of our conversation by lexical order.\"\n", + ")\n", "print(f\"Q: {answer['question']} \\nA: {answer['response']}\\n\")" ] } diff --git a/examples/trip/demo_orchestrator_trip.ipynb b/examples/trip/demo_orchestrator_trip.ipynb index 989197f..fbb662d 100644 --- a/examples/trip/demo_orchestrator_trip.ipynb +++ b/examples/trip/demo_orchestrator_trip.ipynb @@ -41,7 +41,13 @@ "from graphrag_sdk.agents.kg_agent import KGAgent\n", "from graphrag_sdk.models.openai import OpenAiGenerativeModel\n", "from graphrag_sdk import (\n", - " Ontology, Entity, Relation, Attribute, AttributeType, KnowledgeGraph, KnowledgeGraphModelConfig\n", + " Ontology,\n", + " Entity,\n", + " Relation,\n", + " Attribute,\n", + " AttributeType,\n", + " KnowledgeGraph,\n", + " KnowledgeGraphModelConfig,\n", ")\n", "\n", "# Load environment variables\n", @@ -402,7 +408,9 @@ "orchestrator.register_agent(attractions_agent)\n", "\n", "# Query the orchestrator\n", - "runner = orchestrator.ask(\"Create a two-day itinerary for a trip to Rome. Please don't ask me any questions. Just provide the best itinerary you can.\")" + "runner = orchestrator.ask(\n", + " \"Create a two-day itinerary for a trip to Rome. Please don't ask me any questions. Just provide the best itinerary you can.\"\n", + ")" ] }, { @@ -464,7 +472,9 @@ } ], "source": [ - "runner = orchestrator.ask(\"Please tell me only the name of the restaurant for dinner at the first day that you mention in the itinerary of the trip\")\n", + "runner = orchestrator.ask(\n", + " \"Please tell me only the name of the restaurant for dinner at the first day that you mention in the itinerary of the trip\"\n", + ")\n", "print(runner.output)" ] }, @@ -510,7 +520,9 @@ } ], "source": [ - "runner = orchestrator.ask(\"Can you change this restaurant to another one and give me the updated itinerary?\")\n", + "runner = orchestrator.ask(\n", + " \"Can you change this restaurant to another one and give me the updated itinerary?\"\n", + ")\n", "print(runner.output)" ] }, @@ -528,7 +540,9 @@ } ], "source": [ - "runner = orchestrator.ask(\"Please tell me attraction on the morning at the first day that you mention in the itinerary of the trip\")\n", + "runner = orchestrator.ask(\n", + " \"Please tell me attraction on the morning at the first day that you mention in the itinerary of the trip\"\n", + ")\n", "print(runner.output)" ] } diff --git a/graphrag_sdk/attribute.py b/graphrag_sdk/attribute.py index a784a6a..9b74396 100644 --- a/graphrag_sdk/attribute.py +++ b/graphrag_sdk/attribute.py @@ -157,4 +157,4 @@ def __str__(self) -> str: Returns: str: A string representation of the Attribute object. """ - return f"{self.name}: \"{self.type}{'!' if self.unique else ''}{'*' if self.required else ''}\"" + return f'{self.name}: "{self.type}{"!" if self.unique else ""}{"*" if self.required else ""}"' diff --git a/graphrag_sdk/document_loaders/csv.py b/graphrag_sdk/document_loaders/csv.py index d0dae73..a2a38be 100644 --- a/graphrag_sdk/document_loaders/csv.py +++ b/graphrag_sdk/document_loaders/csv.py @@ -23,8 +23,7 @@ def load(self) -> Iterator[Document]: [ ",".join(row) for row in rows[ - i - * self.rows_per_document : (i + 1) + i * self.rows_per_document : (i + 1) * self.rows_per_document ] ] diff --git a/graphrag_sdk/document_loaders/pdf.py b/graphrag_sdk/document_loaders/pdf.py index 1c086b2..4f3e8b5 100644 --- a/graphrag_sdk/document_loaders/pdf.py +++ b/graphrag_sdk/document_loaders/pdf.py @@ -19,7 +19,7 @@ def __init__(self, path: str) -> None: __import__("pypdf") except ModuleNotFoundError: raise ModuleNotFoundError( - "pypdf package not found, please install it with " "`pip install pypdf`" + "pypdf package not found, please install it with `pip install pypdf`" ) self.path = path diff --git a/graphrag_sdk/helpers.py b/graphrag_sdk/helpers.py index 8d2505e..85c42a1 100644 --- a/graphrag_sdk/helpers.py +++ b/graphrag_sdk/helpers.py @@ -67,7 +67,6 @@ def stringify_falkordb_response(response): def extract_cypher(text: str): - if not text.startswith("```"): return text @@ -138,7 +137,6 @@ def validate_cypher_relations_exist(cypher: str, ontology: graphrag_sdk.Ontology def validate_cypher_relation_directions(cypher: str, ontology: graphrag_sdk.Ontology): - errors = [] relations = list(re.finditer(r"\[.*?\]", cypher)) i = 0 diff --git a/graphrag_sdk/kg.py b/graphrag_sdk/kg.py index 138f8c0..fa3b92e 100644 --- a/graphrag_sdk/kg.py +++ b/graphrag_sdk/kg.py @@ -196,7 +196,6 @@ def _create_graph_with_sources( instructions: str = None, hide_progress: bool = False, ) -> list[AbstractSource]: - step = ExtractDataStep( sources=list(sources), ontology=self.ontology, diff --git a/graphrag_sdk/models/gemini.py b/graphrag_sdk/models/gemini.py index 6748c54..756aefa 100644 --- a/graphrag_sdk/models/gemini.py +++ b/graphrag_sdk/models/gemini.py @@ -18,7 +18,6 @@ class GeminiGenerativeModel(GenerativeModel): - _model: GoogleGenerativeModel = None def __init__( @@ -99,7 +98,6 @@ def from_json(json: dict) -> "GenerativeModel": class GeminiChatSession(GenerativeModelChatSession): - def __init__(self, model: GeminiGenerativeModel, args: dict | None = None): self._model = model self._chat_session = self._model._model.start_chat( diff --git a/graphrag_sdk/models/model.py b/graphrag_sdk/models/model.py index 41da684..a5376c1 100644 --- a/graphrag_sdk/models/model.py +++ b/graphrag_sdk/models/model.py @@ -70,7 +70,6 @@ def from_json(json: dict) -> "GenerativeModelConfig": class GenerationResponse: - def __init__(self, text: str, finish_reason: FinishReason): self.text = text self.finish_reason = finish_reason diff --git a/graphrag_sdk/models/openai.py b/graphrag_sdk/models/openai.py index cbda2c2..07a2a23 100644 --- a/graphrag_sdk/models/openai.py +++ b/graphrag_sdk/models/openai.py @@ -10,7 +10,6 @@ class OpenAiGenerativeModel(GenerativeModel): - client: OpenAI = None def __init__( @@ -72,7 +71,6 @@ def from_json(json: dict) -> "GenerativeModel": class OpenAiChatSession(GenerativeModelChatSession): - _history = [] def __init__(self, model: OpenAiGenerativeModel, args: dict | None = None): diff --git a/graphrag_sdk/ontology.py b/graphrag_sdk/ontology.py index 3fe15a6..e5de184 100644 --- a/graphrag_sdk/ontology.py +++ b/graphrag_sdk/ontology.py @@ -249,7 +249,7 @@ def validate_entities(self): f""" *** WARNING *** The following entities do not have unique attributes: -{', '.join(entities_without_unique_attributes)} +{", ".join(entities_without_unique_attributes)} """ ) return False diff --git a/graphrag_sdk/orchestrator/execution_plan.py b/graphrag_sdk/orchestrator/execution_plan.py index b1beb47..1fae227 100644 --- a/graphrag_sdk/orchestrator/execution_plan.py +++ b/graphrag_sdk/orchestrator/execution_plan.py @@ -3,7 +3,6 @@ class ExecutionPlan: - steps: list[PlanStep] = [] def __init__(self, steps: list[PlanStep]): diff --git a/graphrag_sdk/orchestrator/orchestrator.py b/graphrag_sdk/orchestrator/orchestrator.py index cd3cf54..7b77749 100644 --- a/graphrag_sdk/orchestrator/orchestrator.py +++ b/graphrag_sdk/orchestrator/orchestrator.py @@ -15,7 +15,6 @@ class Orchestrator: - def __init__(self, model: GenerativeModel, backstory: str = ""): self._model = model self._backstory = backstory diff --git a/graphrag_sdk/orchestrator/orchestrator_runner.py b/graphrag_sdk/orchestrator/orchestrator_runner.py index 954fa4a..a7ff642 100644 --- a/graphrag_sdk/orchestrator/orchestrator_runner.py +++ b/graphrag_sdk/orchestrator/orchestrator_runner.py @@ -11,7 +11,6 @@ class OrchestratorResult(StepResult): - def __init__(self, output: str): self._output = output @@ -86,7 +85,6 @@ def get_user_input(self, question: str) -> str: return input(question) def run(self) -> OrchestratorResult: - first_step = self._plan.steps[0] if len(self._plan.steps) > 0 else None if first_step is None: @@ -162,7 +160,6 @@ def _get_orchestrator_decision( self, next_step: PlanStep | None = None, ) -> OrchestratorDecision: - response = self.chat.send_message( ORCHESTRATOR_DECISION_PROMPT.replace( "#LOG_HISTORY", diff --git a/graphrag_sdk/orchestrator/step.py b/graphrag_sdk/orchestrator/step.py index e14ea7e..beef8aa 100644 --- a/graphrag_sdk/orchestrator/step.py +++ b/graphrag_sdk/orchestrator/step.py @@ -24,7 +24,6 @@ def from_str(text: str) -> "StepBlockType": class PlanStep(ABC): - @property @abstractmethod def id(self) -> str: diff --git a/graphrag_sdk/orchestrator/step_result.py b/graphrag_sdk/orchestrator/step_result.py index d077403..de67111 100644 --- a/graphrag_sdk/orchestrator/step_result.py +++ b/graphrag_sdk/orchestrator/step_result.py @@ -2,7 +2,6 @@ class StepResult(ABC): - @property @abstractmethod def output(self) -> str: diff --git a/graphrag_sdk/orchestrator/steps/agent.py b/graphrag_sdk/orchestrator/steps/agent.py index bb48d1c..1a19f62 100644 --- a/graphrag_sdk/orchestrator/steps/agent.py +++ b/graphrag_sdk/orchestrator/steps/agent.py @@ -8,7 +8,6 @@ class AgentStepResult(StepResult): - def __init__(self, response_code: AgentResponseCode, payload: dict): self.response_code = response_code self.payload = payload @@ -38,7 +37,6 @@ def output(self) -> str: class AgentProperties: - def __init__(self, agent_id: str, session_id: str = None, payload: dict = None): self.agent_id = agent_id self.session_id = session_id @@ -67,7 +65,6 @@ def __repr__(self) -> str: class AgentStep(PlanStep): - def __init__(self, id: str, properties: AgentProperties): self._id = id self._properties = properties diff --git a/graphrag_sdk/orchestrator/steps/parallel.py b/graphrag_sdk/orchestrator/steps/parallel.py index 00ac663..4e31c10 100644 --- a/graphrag_sdk/orchestrator/steps/parallel.py +++ b/graphrag_sdk/orchestrator/steps/parallel.py @@ -57,7 +57,6 @@ def __repr__(self) -> str: class ParallelStep(PlanStep): - def __init__(self, id: str, properties: ParallelProperties): self._id = id self._properties = properties diff --git a/graphrag_sdk/orchestrator/steps/summary.py b/graphrag_sdk/orchestrator/steps/summary.py index d01fc61..ae1752e 100644 --- a/graphrag_sdk/orchestrator/steps/summary.py +++ b/graphrag_sdk/orchestrator/steps/summary.py @@ -9,7 +9,6 @@ class SummaryResult(StepResult): - def __init__(self, output: str): self._output = output @@ -36,7 +35,6 @@ def output(self) -> str: class SummaryStep(graphrag_sdk.orchestrator.step.PlanStep): - def __init__(self, id: str, properties: any): self._id = id self._properties = {} diff --git a/graphrag_sdk/orchestrator/steps/user_input.py b/graphrag_sdk/orchestrator/steps/user_input.py index 0ecaaec..d256c54 100644 --- a/graphrag_sdk/orchestrator/steps/user_input.py +++ b/graphrag_sdk/orchestrator/steps/user_input.py @@ -7,7 +7,6 @@ class UserInputResult(StepResult): - def __init__(self, output: str): self._output = output @@ -34,7 +33,6 @@ def output(self) -> str: class UserInputProperties: - def __init__(self, question: str): self.question = question @@ -57,7 +55,6 @@ def __repr__(self) -> str: class UserInputStep(PlanStep): - def __init__(self, id: str, properties: UserInputProperties): self._id = id self._properties = properties diff --git a/graphrag_sdk/steps/Step.py b/graphrag_sdk/steps/Step.py index 5ceec5d..2f43df1 100644 --- a/graphrag_sdk/steps/Step.py +++ b/graphrag_sdk/steps/Step.py @@ -1,4 +1,3 @@ class Step: - def run(self): pass diff --git a/graphrag_sdk/steps/create_ontology_step.py b/graphrag_sdk/steps/create_ontology_step.py index 8c70d05..089b385 100644 --- a/graphrag_sdk/steps/create_ontology_step.py +++ b/graphrag_sdk/steps/create_ontology_step.py @@ -68,7 +68,6 @@ def run(self, boundaries: Optional[str] = None): disable=self.hide_progress, ) as pbar: with ThreadPoolExecutor(max_workers=self.config["max_workers"]) as executor: - # Process each source document in parallel for source in self.sources: task = executor.submit( diff --git a/graphrag_sdk/steps/extract_data_step.py b/graphrag_sdk/steps/extract_data_step.py index 8447583..0028a43 100644 --- a/graphrag_sdk/steps/extract_data_step.py +++ b/graphrag_sdk/steps/extract_data_step.py @@ -67,7 +67,6 @@ def _create_chat(self): return self.model.start_chat({"response_validation": False}) def run(self, instructions: str = None) -> list[AbstractSource]: - tasks: list[Future[Ontology]] = [] with tqdm( @@ -76,7 +75,6 @@ def run(self, instructions: str = None) -> list[AbstractSource]: disable=self.hide_progress, ) as pbar: with ThreadPoolExecutor(max_workers=self.config["max_workers"]) as executor: - # Process each source document in parallel for source in self.sources: task_id = "extract_data_step_" + str(uuid4()) diff --git a/poetry.lock b/poetry.lock index f600b18..6cde9dd 100644 --- a/poetry.lock +++ b/poetry.lock @@ -359,6 +359,52 @@ charset-normalizer = ["charset-normalizer"] html5lib = ["html5lib"] lxml = ["lxml"] +[[package]] +name = "black" +version = "24.10.0" +description = "The uncompromising code formatter." +optional = false +python-versions = ">=3.9" +files = [ + {file = "black-24.10.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e6668650ea4b685440857138e5fe40cde4d652633b1bdffc62933d0db4ed9812"}, + {file = "black-24.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:1c536fcf674217e87b8cc3657b81809d3c085d7bf3ef262ead700da345bfa6ea"}, + {file = "black-24.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:649fff99a20bd06c6f727d2a27f401331dc0cc861fb69cde910fe95b01b5928f"}, + {file = "black-24.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:fe4d6476887de70546212c99ac9bd803d90b42fc4767f058a0baa895013fbb3e"}, + {file = "black-24.10.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5a2221696a8224e335c28816a9d331a6c2ae15a2ee34ec857dcf3e45dbfa99ad"}, + {file = "black-24.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f9da3333530dbcecc1be13e69c250ed8dfa67f43c4005fb537bb426e19200d50"}, + {file = "black-24.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4007b1393d902b48b36958a216c20c4482f601569d19ed1df294a496eb366392"}, + {file = "black-24.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:394d4ddc64782e51153eadcaaca95144ac4c35e27ef9b0a42e121ae7e57a9175"}, + {file = "black-24.10.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b5e39e0fae001df40f95bd8cc36b9165c5e2ea88900167bddf258bacef9bbdc3"}, + {file = "black-24.10.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d37d422772111794b26757c5b55a3eade028aa3fde43121ab7b673d050949d65"}, + {file = "black-24.10.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:14b3502784f09ce2443830e3133dacf2c0110d45191ed470ecb04d0f5f6fcb0f"}, + {file = "black-24.10.0-cp312-cp312-win_amd64.whl", hash = "sha256:30d2c30dc5139211dda799758559d1b049f7f14c580c409d6ad925b74a4208a8"}, + {file = "black-24.10.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:1cbacacb19e922a1d75ef2b6ccaefcd6e93a2c05ede32f06a21386a04cedb981"}, + {file = "black-24.10.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:1f93102e0c5bb3907451063e08b9876dbeac810e7da5a8bfb7aeb5a9ef89066b"}, + {file = "black-24.10.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ddacb691cdcdf77b96f549cf9591701d8db36b2f19519373d60d31746068dbf2"}, + {file = "black-24.10.0-cp313-cp313-win_amd64.whl", hash = "sha256:680359d932801c76d2e9c9068d05c6b107f2584b2a5b88831c83962eb9984c1b"}, + {file = "black-24.10.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:17374989640fbca88b6a448129cd1745c5eb8d9547b464f281b251dd00155ccd"}, + {file = "black-24.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:63f626344343083322233f175aaf372d326de8436f5928c042639a4afbbf1d3f"}, + {file = "black-24.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ccfa1d0cb6200857f1923b602f978386a3a2758a65b52e0950299ea014be6800"}, + {file = "black-24.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:2cd9c95431d94adc56600710f8813ee27eea544dd118d45896bb734e9d7a0dc7"}, + {file = "black-24.10.0-py3-none-any.whl", hash = "sha256:3bb2b7a1f7b685f85b11fed1ef10f8a9148bceb49853e47a294a3dd963c1dd7d"}, + {file = "black-24.10.0.tar.gz", hash = "sha256:846ea64c97afe3bc677b761787993be4991810ecc7a4a937816dd6bddedc4875"}, +] + +[package.dependencies] +click = ">=8.0.0" +mypy-extensions = ">=0.4.3" +packaging = ">=22.0" +pathspec = ">=0.9.0" +platformdirs = ">=2" +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} +typing-extensions = {version = ">=4.0.1", markers = "python_version < \"3.11\""} + +[package.extras] +colorama = ["colorama (>=0.4.3)"] +d = ["aiohttp (>=3.10)"] +jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] +uvloop = ["uvloop (>=0.15.2)"] + [[package]] name = "bleach" version = "6.2.0" @@ -597,7 +643,7 @@ files = [ name = "click" version = "8.1.8" description = "Composable command line interface toolkit" -optional = true +optional = false python-versions = ">=3.7" files = [ {file = "click-8.1.8-py3-none-any.whl", hash = "sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2"}, @@ -990,16 +1036,16 @@ files = [ google-auth = ">=2.14.1,<3.0.dev0" googleapis-common-protos = ">=1.56.2,<2.0.dev0" grpcio = [ - {version = ">=1.49.1,<2.0dev", optional = true, markers = "python_version >= \"3.11\" and extra == \"grpc\""}, {version = ">=1.33.2,<2.0dev", optional = true, markers = "python_version < \"3.11\" and extra == \"grpc\""}, + {version = ">=1.49.1,<2.0dev", optional = true, markers = "python_version >= \"3.11\" and extra == \"grpc\""}, ] grpcio-status = [ - {version = ">=1.49.1,<2.0.dev0", optional = true, markers = "python_version >= \"3.11\" and extra == \"grpc\""}, {version = ">=1.33.2,<2.0.dev0", optional = true, markers = "python_version < \"3.11\" and extra == \"grpc\""}, + {version = ">=1.49.1,<2.0.dev0", optional = true, markers = "python_version >= \"3.11\" and extra == \"grpc\""}, ] proto-plus = [ - {version = ">=1.25.0,<2.0.0dev", markers = "python_version >= \"3.13\""}, {version = ">=1.22.3,<2.0.0dev", markers = "python_version < \"3.13\""}, + {version = ">=1.25.0,<2.0.0dev", markers = "python_version >= \"3.13\""}, ] protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<6.0.0.dev0" requests = ">=2.18.0,<3.0.0.dev0" @@ -1179,8 +1225,8 @@ google-api-core = {version = ">=1.34.1,<2.0.dev0 || >=2.11.dev0,<3.0.0dev", extr google-auth = ">=2.14.1,<2.24.0 || >2.24.0,<2.25.0 || >2.25.0,<3.0.0dev" grpc-google-iam-v1 = ">=0.12.4,<1.0.0dev" proto-plus = [ - {version = ">=1.25.0,<2.0.0dev", markers = "python_version >= \"3.13\""}, {version = ">=1.22.3,<2.0.0dev", markers = "python_version < \"3.13\""}, + {version = ">=1.25.0,<2.0.0dev", markers = "python_version >= \"3.13\""}, ] protobuf = ">=3.20.2,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<6.0.0dev" @@ -2356,6 +2402,17 @@ files = [ [package.dependencies] typing-extensions = {version = ">=4.1.0", markers = "python_version < \"3.11\""} +[[package]] +name = "mypy-extensions" +version = "1.0.0" +description = "Type system extensions for programs checked with the mypy type checker." +optional = false +python-versions = ">=3.5" +files = [ + {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"}, + {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"}, +] + [[package]] name = "nbclient" version = "0.10.2" @@ -2655,9 +2712,9 @@ files = [ [package.dependencies] numpy = [ - {version = ">=1.26.0", markers = "python_version >= \"3.12\""}, - {version = ">=1.23.2", markers = "python_version == \"3.11\""}, {version = ">=1.22.4", markers = "python_version < \"3.11\""}, + {version = ">=1.23.2", markers = "python_version == \"3.11\""}, + {version = ">=1.26.0", markers = "python_version >= \"3.12\""}, ] python-dateutil = ">=2.8.2" pytz = ">=2020.1" @@ -2714,6 +2771,17 @@ files = [ qa = ["flake8 (==5.0.4)", "mypy (==0.971)", "types-setuptools (==67.2.0.1)"] testing = ["docopt", "pytest"] +[[package]] +name = "pathspec" +version = "0.12.1" +description = "Utility library for gitignore style pattern matching of file paths." +optional = false +python-versions = ">=3.8" +files = [ + {file = "pathspec-0.12.1-py3-none-any.whl", hash = "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08"}, + {file = "pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"}, +] + [[package]] name = "pexpect" version = "4.9.0" @@ -3818,6 +3886,33 @@ files = [ [package.dependencies] pyasn1 = ">=0.1.3" +[[package]] +name = "ruff" +version = "0.9.1" +description = "An extremely fast Python linter and code formatter, written in Rust." +optional = false +python-versions = ">=3.7" +files = [ + {file = "ruff-0.9.1-py3-none-linux_armv6l.whl", hash = "sha256:84330dda7abcc270e6055551aca93fdde1b0685fc4fd358f26410f9349cf1743"}, + {file = "ruff-0.9.1-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:3cae39ba5d137054b0e5b472aee3b78a7c884e61591b100aeb544bcd1fc38d4f"}, + {file = "ruff-0.9.1-py3-none-macosx_11_0_arm64.whl", hash = "sha256:50c647ff96f4ba288db0ad87048257753733763b409b2faf2ea78b45c8bb7fcb"}, + {file = "ruff-0.9.1-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f0c8b149e9c7353cace7d698e1656ffcf1e36e50f8ea3b5d5f7f87ff9986a7ca"}, + {file = "ruff-0.9.1-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:beb3298604540c884d8b282fe7625651378e1986c25df51dec5b2f60cafc31ce"}, + {file = "ruff-0.9.1-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:39d0174ccc45c439093971cc06ed3ac4dc545f5e8bdacf9f067adf879544d969"}, + {file = "ruff-0.9.1-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:69572926c0f0c9912288915214ca9b2809525ea263603370b9e00bed2ba56dbd"}, + {file = "ruff-0.9.1-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:937267afce0c9170d6d29f01fcd1f4378172dec6760a9f4dface48cdabf9610a"}, + {file = "ruff-0.9.1-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:186c2313de946f2c22bdf5954b8dd083e124bcfb685732cfb0beae0c47233d9b"}, + {file = "ruff-0.9.1-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f94942a3bb767675d9a051867c036655fe9f6c8a491539156a6f7e6b5f31831"}, + {file = "ruff-0.9.1-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:728d791b769cc28c05f12c280f99e8896932e9833fef1dd8756a6af2261fd1ab"}, + {file = "ruff-0.9.1-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:2f312c86fb40c5c02b44a29a750ee3b21002bd813b5233facdaf63a51d9a85e1"}, + {file = "ruff-0.9.1-py3-none-musllinux_1_2_i686.whl", hash = "sha256:ae017c3a29bee341ba584f3823f805abbe5fe9cd97f87ed07ecbf533c4c88366"}, + {file = "ruff-0.9.1-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:5dc40a378a0e21b4cfe2b8a0f1812a6572fc7b230ef12cd9fac9161aa91d807f"}, + {file = "ruff-0.9.1-py3-none-win32.whl", hash = "sha256:46ebf5cc106cf7e7378ca3c28ce4293b61b449cd121b98699be727d40b79ba72"}, + {file = "ruff-0.9.1-py3-none-win_amd64.whl", hash = "sha256:342a824b46ddbcdddd3abfbb332fa7fcaac5488bf18073e841236aadf4ad5c19"}, + {file = "ruff-0.9.1-py3-none-win_arm64.whl", hash = "sha256:1cd76c7f9c679e6e8f2af8f778367dca82b95009bc7b1a85a47f1521ae524fa7"}, + {file = "ruff-0.9.1.tar.gz", hash = "sha256:fd2b25ecaf907d6458fa842675382c8597b3c746a2dde6717fe3415425df0c17"}, +] + [[package]] name = "send2trash" version = "1.8.3" @@ -4651,4 +4746,4 @@ vertexai = ["vertexai"] [metadata] lock-version = "2.0" python-versions = "^3.9.0" -content-hash = "d53e56537233e2b2c26621582df70c2adbba414af24a25ccecfa8d430e692b95" +content-hash = "d4e5b51292ec888a9dae2d7d9e8bcc8122222a568e42a5505b64fa02b2544413" diff --git a/pyproject.toml b/pyproject.toml index 610572f..ae5b25c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,6 +44,8 @@ sphinx = "^7.3.7" sphinx-rtd-theme = "^2.0.0" pandas = "^2.2.2" jupyter = "^1.0.0" +ruff = "^0.9.1" +black = "^24.10.0" [build-system] requires = ["poetry-core"] diff --git a/tests/test_auto_create_ontology.py b/tests/test_auto_create_ontology.py index 876db83..945a94d 100644 --- a/tests/test_auto_create_ontology.py +++ b/tests/test_auto_create_ontology.py @@ -20,7 +20,6 @@ class TestAutoDetectOntology(unittest.TestCase): """ def test_auto_detect_ontology(self): - file_path = "tests/data/madoff.txt" sources = [Source(file_path)] diff --git a/tests/test_helper_validate_cypher.py b/tests/test_helper_validate_cypher.py index 6a98522..5fead53 100644 --- a/tests/test_helper_validate_cypher.py +++ b/tests/test_helper_validate_cypher.py @@ -28,7 +28,6 @@ class TestValidateCypher1(unittest.TestCase): @classmethod def setUpClass(cls): - cls._ontology = Ontology() cls._ontology.add_entity( @@ -55,19 +54,16 @@ def setUpClass(cls): ) def test_validate_cypher_entities_exist(self): - errors = validate_cypher_entities_exist(self.cypher, self._ontology) assert len(errors) == 0 def test_validate_cypher_relations_exist(self): - errors = validate_cypher_relations_exist(self.cypher, self._ontology) assert len(errors) == 0 def test_validate_cypher_relation_directions(self): - errors = validate_cypher_relation_directions(self.cypher, self._ontology) assert len(errors) == 0 @@ -89,7 +85,6 @@ class TestValidateCypher2(unittest.TestCase): @classmethod def setUpClass(cls): - cls._ontology = Ontology([], []) cls._ontology.add_entity( @@ -116,19 +111,16 @@ def setUpClass(cls): ) def test_validate_cypher_entities_exist(self): - errors = validate_cypher_entities_exist(self.cypher, self._ontology) assert len(errors) == 0 def test_validate_cypher_relations_exist(self): - errors = validate_cypher_relations_exist(self.cypher, self._ontology) assert len(errors) == 0 def test_validate_cypher_relation_directions(self): - errors = validate_cypher_relation_directions(self.cypher, self._ontology) assert len(errors) == 1 @@ -151,7 +143,6 @@ class TestValidateCypher3(unittest.TestCase): @classmethod def setUpClass(cls): - cls._ontology = Ontology([], []) cls._ontology.add_entity( @@ -201,19 +192,16 @@ def setUpClass(cls): ) def test_validate_cypher_nodes_exist(self): - errors = validate_cypher_entities_exist(self.cypher, self._ontology) assert len(errors) == 0 def test_validate_cypher_edges_exist(self): - errors = validate_cypher_relations_exist(self.cypher, self._ontology) assert len(errors) == 0 def test_validate_cypher_edge_directions(self): - errors = validate_cypher_relation_directions(self.cypher, self._ontology) assert len(errors) == 0 diff --git a/tests/test_kg.py b/tests/test_kg.py index 3398eae..b508f63 100644 --- a/tests/test_kg.py +++ b/tests/test_kg.py @@ -21,7 +21,6 @@ class TestKG(unittest.TestCase): @classmethod def setUpClass(cls): - cls.ontology = Ontology([], []) cls.ontology.add_entity( diff --git a/tests/test_kg_gemini.py b/tests/test_kg_gemini.py index d65ba93..e12fc98 100644 --- a/tests/test_kg_gemini.py +++ b/tests/test_kg_gemini.py @@ -28,7 +28,6 @@ class TestKGGemini(unittest.TestCase): @classmethod def setUpClass(cls): - cls.ontology = Ontology([], []) cls.ontology.add_entity( diff --git a/tests/test_kg_litellm_openai.py b/tests/test_kg_litellm_openai.py index 2482849..2c612ab 100644 --- a/tests/test_kg_litellm_openai.py +++ b/tests/test_kg_litellm_openai.py @@ -1,7 +1,6 @@ import re import logging import unittest -from falkordb import FalkorDB from dotenv import load_dotenv from graphrag_sdk.entity import Entity from graphrag_sdk.source import Source @@ -24,7 +23,6 @@ class TestKGLiteLLM(unittest.TestCase): @classmethod def setUpClass(cls): - cls.ontology = Ontology([], []) cls.ontology.add_entity( @@ -77,7 +75,6 @@ def setUpClass(cls): ) def test_kg_creation(self): - file_path = "tests/data/madoff.txt" sources = [Source(file_path)] diff --git a/tests/test_kg_ollama.py b/tests/test_kg_ollama.py index 5b3992f..770943f 100644 --- a/tests/test_kg_ollama.py +++ b/tests/test_kg_ollama.py @@ -30,7 +30,6 @@ class TestKGOllama(unittest.TestCase): @classmethod def setUpClass(cls): - cls.ontology = Ontology([], []) cls.ontology.add_entity( @@ -94,7 +93,6 @@ def setUpClass(cls): ) def test_kg_creation(self): - file_path = "tests/data/madoff.txt" sources = [Source(file_path)] @@ -113,7 +111,6 @@ def test_kg_creation(self): assert num_actors > 5, "The number of actors found should be greater than 5" def test_kg_delete(self): - self.kg.delete() db = FalkorDB() diff --git a/tests/test_kg_openai.py b/tests/test_kg_openai.py index c496c09..68c3aae 100644 --- a/tests/test_kg_openai.py +++ b/tests/test_kg_openai.py @@ -24,7 +24,6 @@ class TestKGOpenAI(unittest.TestCase): @classmethod def setUpClass(cls): - cls.ontology = Ontology([], []) cls.ontology.add_entity( @@ -77,7 +76,6 @@ def setUpClass(cls): ) def test_kg_creation(self): - file_path = "tests/data/madoff.txt" sources = [Source(file_path)] diff --git a/tests/test_multi_agent.py b/tests/test_multi_agent.py index f320396..fbdb92c 100644 --- a/tests/test_multi_agent.py +++ b/tests/test_multi_agent.py @@ -17,10 +17,8 @@ class TestMultiAgent(unittest.TestCase): - @classmethod def setUpClass(cls): - cls.restaurants_ontology = Ontology() cls.restaurants_ontology.add_entity( Entity( @@ -306,7 +304,6 @@ def import_data( ) def test_multi_agent(self): - response = self.orchestrator.ask( "Write me a two-day itinerary for a trip to Rome. Do not ask any questions to me, just provide your best itinerary." ) From 7b90b9ea7cddb85d0d32f8bcdaf635d4f9499ca3 Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Sat, 11 Jan 2025 20:45:27 +0200 Subject: [PATCH 6/6] fix lint --- .github/workflows/test.yml | 1 - graphrag_sdk/document_loaders/csv.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 14b26cf..a1becd6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,7 +63,6 @@ jobs: - name: Run Lint run: | poetry run ruff check ./graphrag_sdk/ - poetry run ruff format --check ./graphrag_sdk/ poetry run black ./graphrag_sdk/ --check - name: Wait for Ollama to be ready diff --git a/graphrag_sdk/document_loaders/csv.py b/graphrag_sdk/document_loaders/csv.py index a2a38be..d0dae73 100644 --- a/graphrag_sdk/document_loaders/csv.py +++ b/graphrag_sdk/document_loaders/csv.py @@ -23,7 +23,8 @@ def load(self) -> Iterator[Document]: [ ",".join(row) for row in rows[ - i * self.rows_per_document : (i + 1) + i + * self.rows_per_document : (i + 1) * self.rows_per_document ] ]