From 031070144c521af98d19f89e7fe507667199db3a Mon Sep 17 00:00:00 2001
From: Dan Yishai <danyi1212@users.noreply.github.com>
Date: Tue, 23 Jul 2024 14:53:02 +0300
Subject: [PATCH] Fixed pre-commit

---
 .../opal_client/policy_store/mock_policy_store_client.py   | 6 ++++--
 packages/opal-common/opal_common/cli/typer_app.py          | 1 -
 packages/opal-common/opal_common/confi/cli.py              | 3 +--
 packages/opal-common/opal_common/confi/confi.py            | 5 ++---
 packages/opal-common/opal_common/config.py                 | 2 +-
 .../opal_common/fetcher/engine/base_fetching_engine.py     | 2 +-
 .../opal-common/opal_common/fetcher/engine/fetch_worker.py | 2 +-
 .../opal_common/fetcher/engine/fetching_engine.py          | 6 +++---
 packages/opal-common/opal_common/fetcher/fetch_provider.py | 3 +--
 .../opal-common/opal_common/fetcher/fetcher_register.py    | 3 +--
 .../fetcher/providers/fastapi_rpc_fetch_provider.py        | 1 -
 .../opal_common/fetcher/providers/http_fetch_provider.py   | 7 +++----
 .../opal_common/git_utils/tests/diff_viewer_test.py        | 5 ++++-
 packages/opal-common/opal_common/logger.py                 | 1 -
 .../opal-common/opal_common/sources/api_policy_source.py   | 4 +++-
 packages/opal-server/opal_server/policy/bundles/api.py     | 1 -
 16 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/packages/opal-client/opal_client/policy_store/mock_policy_store_client.py b/packages/opal-client/opal_client/policy_store/mock_policy_store_client.py
index 8d6742d4..549dd843 100644
--- a/packages/opal-client/opal_client/policy_store/mock_policy_store_client.py
+++ b/packages/opal-client/opal_client/policy_store/mock_policy_store_client.py
@@ -3,13 +3,15 @@
 from typing import Any, Dict, List, Optional
 
 import jsonpatch
+from opal_client.policy_store.base_policy_store_client import (
+    BasePolicyStoreClient,
+    JsonableValue,
+)
 from opal_client.utils import exclude_none_fields
 from opal_common.schemas.policy import PolicyBundle
 from opal_common.schemas.store import JSONPatchAction, StoreTransaction
 from pydantic import BaseModel
 
-from opal_client.policy_store.base_policy_store_client import BasePolicyStoreClient, JsonableValue
-
 
 class MockPolicyStoreClient(BasePolicyStoreClient):
     """A naive mock policy and policy-data store for tests."""
diff --git a/packages/opal-common/opal_common/cli/typer_app.py b/packages/opal-common/opal_common/cli/typer_app.py
index a1d70ff2..47d38dd3 100644
--- a/packages/opal-common/opal_common/cli/typer_app.py
+++ b/packages/opal-common/opal_common/cli/typer_app.py
@@ -1,5 +1,4 @@
 import typer
-
 from opal_common.cli.commands import all_commands
 
 
diff --git a/packages/opal-common/opal_common/confi/cli.py b/packages/opal-common/opal_common/confi/cli.py
index cfca25f1..0ab88e55 100644
--- a/packages/opal-common/opal_common/confi/cli.py
+++ b/packages/opal-common/opal_common/confi/cli.py
@@ -2,9 +2,8 @@
 
 import click
 import typer
-from typer.main import Typer
-
 from opal_common.confi.types import ConfiEntry
+from typer.main import Typer
 
 
 def create_click_cli(confi_entries: Dict[str, ConfiEntry], callback: Callable):
diff --git a/packages/opal-common/opal_common/confi/confi.py b/packages/opal-common/opal_common/confi/confi.py
index f62576df..cbaa9a58 100644
--- a/packages/opal-common/opal_common/confi/confi.py
+++ b/packages/opal-common/opal_common/confi/confi.py
@@ -15,13 +15,12 @@
 from decouple import Csv, UndefinedValueError, config, text_type, undefined
 from opal_common.authentication.casting import cast_private_key, cast_public_key
 from opal_common.authentication.types import EncryptionKeyFormat, PrivateKey, PublicKey
+from opal_common.confi.cli import get_cli_object_for_config_objects
+from opal_common.confi.types import ConfiDelay, ConfiEntry, no_cast
 from opal_common.logging_utils.decorators import log_exception
 from pydantic import BaseModel, ValidationError
 from typer import Typer
 
-from opal_common.confi.cli import get_cli_object_for_config_objects
-from opal_common.confi.types import ConfiDelay, ConfiEntry, no_cast
-
 
 class Placeholder(object):
     """Placeholder instead of default value for decouple."""
diff --git a/packages/opal-common/opal_common/config.py b/packages/opal-common/opal_common/config.py
index b7d9395b..ab18dd0c 100644
--- a/packages/opal-common/opal_common/config.py
+++ b/packages/opal-common/opal_common/config.py
@@ -172,7 +172,7 @@ class OpalCommonConfig(Confi):
         "HTTP_FETCHER_PROVIDER_CLIENT",
         "aiohttp",
         description="The client to use for fetching data, can be either aiohttp or httpx."
-                    "if provided different value, aiohttp will be used.",
+        "if provided different value, aiohttp will be used.",
     )
 
 
diff --git a/packages/opal-common/opal_common/fetcher/engine/base_fetching_engine.py b/packages/opal-common/opal_common/fetcher/engine/base_fetching_engine.py
index 22f9325f..19a636a3 100644
--- a/packages/opal-common/opal_common/fetcher/engine/base_fetching_engine.py
+++ b/packages/opal-common/opal_common/fetcher/engine/base_fetching_engine.py
@@ -1,8 +1,8 @@
 from typing import Coroutine
 
+from opal_common.fetcher.engine.core_callbacks import OnFetchFailureCallback
 from opal_common.fetcher.events import FetcherConfig, FetchEvent
 from opal_common.fetcher.fetcher_register import FetcherRegister
-from opal_common.fetcher.engine.core_callbacks import OnFetchFailureCallback
 
 
 class BaseFetchingEngine:
diff --git a/packages/opal-common/opal_common/fetcher/engine/fetch_worker.py b/packages/opal-common/opal_common/fetcher/engine/fetch_worker.py
index 460ee146..6db97b33 100644
--- a/packages/opal-common/opal_common/fetcher/engine/fetch_worker.py
+++ b/packages/opal-common/opal_common/fetcher/engine/fetch_worker.py
@@ -1,10 +1,10 @@
 import asyncio
 from typing import Coroutine
 
+from opal_common.fetcher.engine.base_fetching_engine import BaseFetchingEngine
 from opal_common.fetcher.events import FetchEvent
 from opal_common.fetcher.fetcher_register import FetcherRegister
 from opal_common.fetcher.logger import get_logger
-from opal_common.fetcher.engine.base_fetching_engine import BaseFetchingEngine
 
 logger = get_logger("fetch_worker")
 
diff --git a/packages/opal-common/opal_common/fetcher/engine/fetching_engine.py b/packages/opal-common/opal_common/fetcher/engine/fetching_engine.py
index cb03693b..b439d4b8 100644
--- a/packages/opal-common/opal_common/fetcher/engine/fetching_engine.py
+++ b/packages/opal-common/opal_common/fetcher/engine/fetching_engine.py
@@ -2,13 +2,13 @@
 import uuid
 from typing import Coroutine, Dict, List, Union
 
+from opal_common.fetcher.engine.base_fetching_engine import BaseFetchingEngine
+from opal_common.fetcher.engine.core_callbacks import OnFetchFailureCallback
+from opal_common.fetcher.engine.fetch_worker import fetch_worker
 from opal_common.fetcher.events import FetcherConfig, FetchEvent
 from opal_common.fetcher.fetch_provider import BaseFetchProvider
 from opal_common.fetcher.fetcher_register import FetcherRegister
 from opal_common.fetcher.logger import get_logger
-from opal_common.fetcher.engine.base_fetching_engine import BaseFetchingEngine
-from opal_common.fetcher.engine.core_callbacks import OnFetchFailureCallback
-from opal_common.fetcher.engine.fetch_worker import fetch_worker
 
 logger = get_logger("engine")
 
diff --git a/packages/opal-common/opal_common/fetcher/fetch_provider.py b/packages/opal-common/opal_common/fetcher/fetch_provider.py
index 70b91ea5..c05008fc 100644
--- a/packages/opal-common/opal_common/fetcher/fetch_provider.py
+++ b/packages/opal-common/opal_common/fetcher/fetch_provider.py
@@ -1,7 +1,6 @@
-from tenacity import retry, stop, wait
-
 from opal_common.fetcher.events import FetchEvent
 from opal_common.fetcher.logger import get_logger
+from tenacity import retry, stop, wait
 
 logger = get_logger("opal.providers")
 
diff --git a/packages/opal-common/opal_common/fetcher/fetcher_register.py b/packages/opal-common/opal_common/fetcher/fetcher_register.py
index 18ed32f8..9abf1322 100644
--- a/packages/opal-common/opal_common/fetcher/fetcher_register.py
+++ b/packages/opal-common/opal_common/fetcher/fetcher_register.py
@@ -1,10 +1,9 @@
 from typing import Dict, Optional, Type
 
-from opal_common.fetcher.logger import get_logger
-
 from opal_common.config import opal_common_config
 from opal_common.fetcher.events import FetchEvent
 from opal_common.fetcher.fetch_provider import BaseFetchProvider
+from opal_common.fetcher.logger import get_logger
 from opal_common.fetcher.providers.http_fetch_provider import HttpFetchProvider
 
 logger = get_logger("opal.fetcher_register")
diff --git a/packages/opal-common/opal_common/fetcher/providers/fastapi_rpc_fetch_provider.py b/packages/opal-common/opal_common/fetcher/providers/fastapi_rpc_fetch_provider.py
index 94513f9d..4b574a8e 100644
--- a/packages/opal-common/opal_common/fetcher/providers/fastapi_rpc_fetch_provider.py
+++ b/packages/opal-common/opal_common/fetcher/providers/fastapi_rpc_fetch_provider.py
@@ -2,7 +2,6 @@
 
 from fastapi_websocket_rpc.rpc_methods import RpcMethodsBase
 from fastapi_websocket_rpc.websocket_rpc_client import WebSocketRpcClient
-
 from opal_common.fetcher.events import FetcherConfig, FetchEvent
 from opal_common.fetcher.fetch_provider import BaseFetchProvider
 from opal_common.fetcher.logger import get_logger
diff --git a/packages/opal-common/opal_common/fetcher/providers/http_fetch_provider.py b/packages/opal-common/opal_common/fetcher/providers/http_fetch_provider.py
index 9083f8aa..fc74223e 100644
--- a/packages/opal-common/opal_common/fetcher/providers/http_fetch_provider.py
+++ b/packages/opal-common/opal_common/fetcher/providers/http_fetch_provider.py
@@ -6,13 +6,12 @@
 import httpx
 from aiohttp import ClientResponse, ClientSession
 from opal_common.config import opal_common_config
-from pydantic import validator
-
-from opal_common.http_utils import is_http_error_response
-from opal_common.security.sslcontext import get_custom_ssl_context
 from opal_common.fetcher.events import FetcherConfig, FetchEvent
 from opal_common.fetcher.fetch_provider import BaseFetchProvider
 from opal_common.fetcher.logger import get_logger
+from opal_common.http_utils import is_http_error_response
+from opal_common.security.sslcontext import get_custom_ssl_context
+from pydantic import validator
 
 logger = get_logger("http_fetch_provider")
 
diff --git a/packages/opal-common/opal_common/git_utils/tests/diff_viewer_test.py b/packages/opal-common/opal_common/git_utils/tests/diff_viewer_test.py
index 974ffaa7..bcfbb93b 100644
--- a/packages/opal-common/opal_common/git_utils/tests/diff_viewer_test.py
+++ b/packages/opal-common/opal_common/git_utils/tests/diff_viewer_test.py
@@ -21,7 +21,10 @@
 from git import Diff, Repo
 from git.objects import Commit
 from opal_common.git_utils.commit_viewer import VersionedFile
-from opal_common.git_utils.diff_viewer import DiffViewer, diffed_file_is_under_directories
+from opal_common.git_utils.diff_viewer import (
+    DiffViewer,
+    diffed_file_is_under_directories,
+)
 
 
 def diff_paths(diffs: List[Diff]) -> List[Path]:
diff --git a/packages/opal-common/opal_common/logger.py b/packages/opal-common/opal_common/logger.py
index 2a45a4dc..8e826abd 100644
--- a/packages/opal-common/opal_common/logger.py
+++ b/packages/opal-common/opal_common/logger.py
@@ -2,7 +2,6 @@
 import sys
 
 from loguru import logger
-
 from opal_common.config import opal_common_config
 from opal_common.logging_utils.filter import ModuleFilter
 from opal_common.logging_utils.formatter import Formatter
diff --git a/packages/opal-common/opal_common/sources/api_policy_source.py b/packages/opal-common/opal_common/sources/api_policy_source.py
index 596e8aba..7adc9ad7 100644
--- a/packages/opal-common/opal_common/sources/api_policy_source.py
+++ b/packages/opal-common/opal_common/sources/api_policy_source.py
@@ -6,7 +6,9 @@
 import aiohttp
 from fastapi import status
 from fastapi.exceptions import HTTPException
-from opal_common.git_utils.tar_file_to_local_git_extractor import TarFileToLocalGitExtractor
+from opal_common.git_utils.tar_file_to_local_git_extractor import (
+    TarFileToLocalGitExtractor,
+)
 from opal_common.logger import logger
 from opal_common.sources.base_policy_source import BasePolicySource
 from opal_common.utils import (
diff --git a/packages/opal-server/opal_server/policy/bundles/api.py b/packages/opal-server/opal_server/policy/bundles/api.py
index 7e25e8ff..ae1da68e 100644
--- a/packages/opal-server/opal_server/policy/bundles/api.py
+++ b/packages/opal-server/opal_server/policy/bundles/api.py
@@ -5,7 +5,6 @@
 import fastapi.responses
 from fastapi import APIRouter, Depends, Header, HTTPException, Query, Response, status
 from git.repo import Repo
-
 from opal_common.confi.confi import load_conf_if_none
 from opal_common.git_utils.bundle_maker import BundleMaker
 from opal_common.git_utils.commit_viewer import CommitViewer