Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add flake8-future-annotations ruff rule #973

Merged
merged 3 commits into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions griptape/artifacts/list_artifact.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
from collections.abc import Sequence
from typing import Optional
from __future__ import annotations

from typing import TYPE_CHECKING, Optional

from attrs import define, field

from griptape.artifacts import BaseArtifact

if TYPE_CHECKING:
from collections.abc import Sequence


@define
class ListArtifact(BaseArtifact):
Expand Down
2 changes: 2 additions & 0 deletions griptape/common/reference.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import uuid
from typing import Optional

Expand Down
2 changes: 2 additions & 0 deletions griptape/config/azure_openai_structure_config.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

from typing import Callable, Optional

from attrs import Factory, define, field
Expand Down
2 changes: 2 additions & 0 deletions griptape/config/structure_config.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

from typing import Optional

from attrs import Factory, define, field
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
from typing import Optional
from __future__ import annotations

from typing import TYPE_CHECKING, Optional

from attrs import define, field

from griptape.artifacts import AudioArtifact, TextArtifact
from griptape.drivers import BaseAudioTranscriptionDriver
from griptape.exceptions import DummyException

if TYPE_CHECKING:
from griptape.artifacts import AudioArtifact, TextArtifact


@define
class DummyAudioTranscriptionDriver(BaseAudioTranscriptionDriver):
Expand Down
2 changes: 2 additions & 0 deletions griptape/drivers/embedding/dummy_embedding_driver.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

from attrs import define, field

from griptape.drivers import BaseEmbeddingDriver
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
from typing import Optional
from __future__ import annotations

from typing import TYPE_CHECKING, Optional

from attrs import define, field

from griptape.artifacts import ImageArtifact
from griptape.drivers import BaseImageGenerationDriver
from griptape.exceptions import DummyException

if TYPE_CHECKING:
from griptape.artifacts import ImageArtifact


@define
class DummyImageGenerationDriver(BaseImageGenerationDriver):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import json
import time
from typing import Literal, Optional
Expand Down
8 changes: 7 additions & 1 deletion griptape/drivers/image_query/dummy_image_query_driver.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
from __future__ import annotations

from typing import TYPE_CHECKING

from attrs import define, field

from griptape.artifacts import ImageArtifact, TextArtifact
from griptape.drivers import BaseImageQueryDriver
from griptape.exceptions import DummyException

if TYPE_CHECKING:
from griptape.artifacts import ImageArtifact, TextArtifact


@define
class DummyImageQueryDriver(BaseImageQueryDriver):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import os
from typing import Optional

Expand Down
8 changes: 6 additions & 2 deletions griptape/drivers/prompt/azure_openai_chat_prompt_driver.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
from typing import Callable, Optional
from __future__ import annotations

from typing import TYPE_CHECKING, Callable, Optional

import openai
from attrs import Factory, define, field

from griptape.common import PromptStack
from griptape.drivers import OpenAiChatPromptDriver

if TYPE_CHECKING:
from griptape.common import PromptStack


@define
class AzureOpenAiChatPromptDriver(OpenAiChatPromptDriver):
Expand Down
6 changes: 5 additions & 1 deletion griptape/drivers/rerank/base_rerank_driver.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
from __future__ import annotations

from abc import ABC, abstractmethod
from typing import TYPE_CHECKING

from attrs import define

from griptape.artifacts import TextArtifact
if TYPE_CHECKING:
from griptape.artifacts import TextArtifact


@define(kw_only=True)
Expand Down
2 changes: 2 additions & 0 deletions griptape/drivers/sql/base_sql_driver.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

from abc import ABC, abstractmethod
from dataclasses import dataclass
from typing import Any, Optional
Expand Down
6 changes: 5 additions & 1 deletion griptape/drivers/structure_run/base_structure_run_driver.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
from __future__ import annotations

from abc import ABC, abstractmethod
from typing import TYPE_CHECKING

from attrs import Factory, define, field

from griptape.artifacts import BaseArtifact
if TYPE_CHECKING:
from griptape.artifacts import BaseArtifact


@define
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
from __future__ import annotations

from typing import TYPE_CHECKING

from attrs import define, field

from griptape.artifacts.audio_artifact import AudioArtifact
from griptape.drivers import BaseTextToSpeechDriver
from griptape.exceptions import DummyException

if TYPE_CHECKING:
from griptape.artifacts.audio_artifact import AudioArtifact


@define
class DummyTextToSpeechDriver(BaseTextToSpeechDriver):
Expand Down
2 changes: 2 additions & 0 deletions griptape/drivers/vector/dummy_vector_store_driver.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

from typing import Optional

from attrs import Factory, define, field
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
from typing import Any, Optional
from __future__ import annotations

from typing import TYPE_CHECKING, Any, Optional
from urllib.parse import urljoin

import requests
from attrs import Factory, define, field

from griptape.artifacts import ListArtifact, TextArtifact
from griptape.drivers import BaseEmbeddingDriver, BaseVectorStoreDriver, DummyEmbeddingDriver

if TYPE_CHECKING:
from griptape.artifacts import ListArtifact, TextArtifact


@define
class GriptapeCloudKnowledgeBaseVectorStoreDriver(BaseVectorStoreDriver):
Expand Down
2 changes: 2 additions & 0 deletions griptape/drivers/vector/local_vector_store_driver.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import json
import os
import threading
Expand Down
2 changes: 2 additions & 0 deletions griptape/drivers/vector/pgvector_vector_store_driver.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import uuid
from collections import OrderedDict
from dataclasses import dataclass
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import re
from typing import Optional

Expand Down
2 changes: 2 additions & 0 deletions griptape/drivers/web_search/google_web_search_driver.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import json

import requests
Expand Down
9 changes: 7 additions & 2 deletions griptape/engines/image_query/image_query_engine.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
from __future__ import annotations

from typing import TYPE_CHECKING

from attrs import define, field

from griptape.artifacts import ImageArtifact, TextArtifact
from griptape.drivers import BaseImageQueryDriver
if TYPE_CHECKING:
from griptape.artifacts import ImageArtifact, TextArtifact
from griptape.drivers import BaseImageQueryDriver


@define
Expand Down
8 changes: 6 additions & 2 deletions griptape/engines/rag/modules/base_rag_module.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
from __future__ import annotations

from abc import ABC
from concurrent import futures
from typing import Any, Callable, Optional
from typing import TYPE_CHECKING, Any, Callable, Optional

from attrs import Factory, define, field

from griptape.common import Message, PromptStack
from griptape.engines.rag import RagContext

if TYPE_CHECKING:
from griptape.engines.rag import RagContext


@define(kw_only=True)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
from __future__ import annotations

from typing import TYPE_CHECKING

from attrs import define

from griptape import utils
from griptape.artifacts import TextArtifact
from griptape.engines.rag import RagContext
from griptape.engines.rag.modules import PromptResponseRagModule
from griptape.utils import J2

if TYPE_CHECKING:
from griptape.artifacts import TextArtifact
from griptape.engines.rag import RagContext


@define(kw_only=True)
class FootnotePromptResponseRagModule(PromptResponseRagModule):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
from typing import Optional
from __future__ import annotations

from typing import TYPE_CHECKING, Optional

from attrs import define, field

from griptape.engines.rag import RagContext
from griptape.engines.rag.modules import BaseBeforeResponseRagModule
from griptape.utils import J2

if TYPE_CHECKING:
from griptape.engines.rag import RagContext


@define(kw_only=True)
class MetadataBeforeResponseRagModule(BaseBeforeResponseRagModule):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
from typing import Callable
from __future__ import annotations

from typing import TYPE_CHECKING, Callable

from attrs import Factory, define, field

from griptape.artifacts.text_artifact import TextArtifact
from griptape.drivers import BasePromptDriver
from griptape.engines.rag import RagContext
from griptape.engines.rag.modules import BaseResponseRagModule
from griptape.utils import J2

if TYPE_CHECKING:
from griptape.drivers import BasePromptDriver
from griptape.engines.rag import RagContext


@define(kw_only=True)
class PromptResponseRagModule(BaseResponseRagModule):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
from __future__ import annotations

from typing import TYPE_CHECKING

from attrs import define, field

from griptape.engines.rag import RagContext
from griptape.engines.rag.modules import BaseBeforeResponseRagModule
from griptape.rules import Ruleset
from griptape.utils import J2

if TYPE_CHECKING:
from griptape.engines.rag import RagContext
from griptape.rules import Ruleset


@define
class RulesetsBeforeResponseRagModule(BaseBeforeResponseRagModule):
Expand Down
8 changes: 6 additions & 2 deletions griptape/engines/rag/rag_engine.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
from typing import Optional
from __future__ import annotations

from typing import TYPE_CHECKING, Optional

from attrs import define, field

from griptape.engines.rag import RagContext
from griptape.engines.rag.stages import QueryRagStage, ResponseRagStage, RetrievalRagStage

if TYPE_CHECKING:
from griptape.engines.rag.stages import QueryRagStage, ResponseRagStage, RetrievalRagStage


@define(kw_only=True)
Expand Down
12 changes: 9 additions & 3 deletions griptape/engines/rag/stages/query_rag_stage.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
from __future__ import annotations

import logging
from collections.abc import Sequence
from typing import TYPE_CHECKING

from attrs import define, field

from griptape import utils
from griptape.engines.rag import RagContext
from griptape.engines.rag.modules import BaseQueryRagModule, BaseRagModule
from griptape.engines.rag.stages import BaseRagStage

if TYPE_CHECKING:
from collections.abc import Sequence

from griptape.engines.rag import RagContext
from griptape.engines.rag.modules import BaseQueryRagModule, BaseRagModule


@define(kw_only=True)
class QueryRagStage(BaseRagStage):
Expand Down
Loading
Loading