Skip to content

Commit

Permalink
chore: add ruff and remove pyupgrade, isort, autoflake, and `…
Browse files Browse the repository at this point in the history
…black`
  • Loading branch information
evansims committed Feb 3, 2025
1 parent c1339ea commit a493fb2
Show file tree
Hide file tree
Showing 16 changed files with 44 additions and 71 deletions.
24 changes: 13 additions & 11 deletions openfga_sdk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,21 @@

__version__ = "0.9.1"

from openfga_sdk.api.open_fga_api import OpenFgaApi
from openfga_sdk.api_client import ApiClient
from openfga_sdk.client.client import OpenFgaClient
from openfga_sdk.client.configuration import ClientConfiguration

from openfga_sdk.api.open_fga_api import OpenFgaApi

from openfga_sdk.api_client import ApiClient
from openfga_sdk.configuration import Configuration
from openfga_sdk.exceptions import (
ApiAttributeError,
ApiException,
ApiKeyError,
ApiValueError,
FgaValidationException,
OpenApiException,
)

from openfga_sdk.exceptions import OpenApiException
from openfga_sdk.exceptions import FgaValidationException
from openfga_sdk.exceptions import ApiValueError
from openfga_sdk.exceptions import ApiKeyError
from openfga_sdk.exceptions import ApiAttributeError
from openfga_sdk.exceptions import ApiException

from openfga_sdk.models.aborted_message_response import AbortedMessageResponse
from openfga_sdk.models.any import Any
from openfga_sdk.models.assertion import Assertion
Expand Down Expand Up @@ -135,6 +137,7 @@
from openfga_sdk.models.write_request import WriteRequest
from openfga_sdk.models.write_request_deletes import WriteRequestDeletes
from openfga_sdk.models.write_request_writes import WriteRequestWrites

from openfga_sdk.telemetry.configuration import (
TelemetryConfiguration,
TelemetryConfigurations,
Expand All @@ -143,7 +146,6 @@
TelemetryMetricsConfiguration,
)


__all__ = [
"OpenFgaClient",
"ClientConfiguration",
Expand Down
5 changes: 1 addition & 4 deletions openfga_sdk/api_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@
import re
import time
import urllib

from multiprocessing.pool import ThreadPool

from dateutil.parser import parse

import openfga_sdk.models

from openfga_sdk import oauth2, rest
from openfga_sdk import rest, oauth2
from openfga_sdk.configuration import Configuration
from openfga_sdk.exceptions import (
ApiException,
Expand All @@ -38,7 +36,6 @@
from openfga_sdk.telemetry import Telemetry
from openfga_sdk.telemetry.attributes import TelemetryAttribute, TelemetryAttributes


DEFAULT_USER_AGENT = "openfga-sdk python/0.9.1"


Expand Down
1 change: 0 additions & 1 deletion openfga_sdk/client/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from openfga_sdk.client.configuration import ClientConfiguration
from openfga_sdk.client.models.check_request import ClientCheckRequest


__all__ = [
"OpenFgaClient",
"ClientConfiguration",
Expand Down
16 changes: 8 additions & 8 deletions openfga_sdk/client/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import asyncio
import uuid

from openfga_sdk.api.open_fga_api import OpenFgaApi
from openfga_sdk.api_client import ApiClient
from openfga_sdk.api.open_fga_api import OpenFgaApi
from openfga_sdk.client.configuration import ClientConfiguration
from openfga_sdk.client.models.assertion import ClientAssertion
from openfga_sdk.client.models.batch_check_item import (
Expand All @@ -26,25 +26,25 @@
from openfga_sdk.client.models.batch_check_single_response import (
ClientBatchCheckSingleResponse,
)
from openfga_sdk.client.models.client_batch_check_response import (
ClientBatchCheckClientResponse,
)
from openfga_sdk.client.models.check_request import (
ClientCheckRequest,
construct_check_request,
)
from openfga_sdk.client.models.client_batch_check_response import (
ClientBatchCheckClientResponse,
)
from openfga_sdk.client.models.tuple import ClientTuple, convert_tuple_keys
from openfga_sdk.client.models.write_request import ClientWriteRequest
from openfga_sdk.client.models.write_response import ClientWriteResponse
from openfga_sdk.client.models.expand_request import ClientExpandRequest
from openfga_sdk.client.models.list_objects_request import ClientListObjectsRequest
from openfga_sdk.client.models.list_relations_request import ClientListRelationsRequest
from openfga_sdk.client.models.list_users_request import ClientListUsersRequest
from openfga_sdk.client.models.read_changes_request import ClientReadChangesRequest
from openfga_sdk.client.models.tuple import ClientTuple, convert_tuple_keys
from openfga_sdk.client.models.write_request import ClientWriteRequest
from openfga_sdk.client.models.write_response import ClientWriteResponse
from openfga_sdk.client.models.write_single_response import (
construct_write_single_response,
)
from openfga_sdk.client.models.write_transaction_opts import WriteTransactionOpts
from openfga_sdk.client.models.read_changes_request import ClientReadChangesRequest
from openfga_sdk.exceptions import (
AuthenticationError,
FgaValidationException,
Expand Down
3 changes: 1 addition & 2 deletions openfga_sdk/client/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
from openfga_sdk.client.models.batch_check_single_response import (
ClientBatchCheckSingleResponse,
)
from openfga_sdk.client.models.check_request import ClientCheckRequest
from openfga_sdk.client.models.client_batch_check_response import (
ClientBatchCheckClientResponse,
)
from openfga_sdk.client.models.check_request import ClientCheckRequest
from openfga_sdk.client.models.expand_request import ClientExpandRequest
from openfga_sdk.client.models.list_objects_request import ClientListObjectsRequest
from openfga_sdk.client.models.list_relations_request import ClientListRelationsRequest
Expand All @@ -30,7 +30,6 @@
from openfga_sdk.client.models.write_response import ClientWriteResponse
from openfga_sdk.client.models.write_transaction_opts import WriteTransactionOpts


__all__ = [
"ClientAssertion",
"ClientBatchCheckItem",
Expand Down
2 changes: 1 addition & 1 deletion openfga_sdk/client/models/write_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"""

from openfga_sdk.client.models.tuple import ClientTuple, convert_tuple_keys
from openfga_sdk.models.write_request_deletes import WriteRequestDeletes
from openfga_sdk.models.write_request_writes import WriteRequestWrites
from openfga_sdk.models.write_request_deletes import WriteRequestDeletes


class ClientWriteRequest:
Expand Down
5 changes: 2 additions & 3 deletions openfga_sdk/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@
"""

import copy
import http
import logging
import sys
import http
import urllib

import urllib3

from openfga_sdk.exceptions import ApiValueError, FgaValidationException
from openfga_sdk.exceptions import FgaValidationException, ApiValueError
from openfga_sdk.telemetry.attributes import TelemetryAttribute
from openfga_sdk.telemetry.configuration import (
TelemetryConfiguration,
Expand Down
1 change: 0 additions & 1 deletion openfga_sdk/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@
from openfga_sdk.models.write_request_deletes import WriteRequestDeletes
from openfga_sdk.models.write_request_writes import WriteRequestWrites


__all__ = [
"AbortedMessageResponse",
"Any",
Expand Down
2 changes: 1 addition & 1 deletion openfga_sdk/sync/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
NOTE: This file was auto generated by OpenAPI Generator (https://openapi-generator.tech). DO NOT EDIT.
"""

from openfga_sdk.sync.api_client import ApiClient
from openfga_sdk.sync.client.client import OpenFgaClient
from openfga_sdk.sync.api_client import ApiClient


__all__ = [
Expand Down
5 changes: 1 addition & 4 deletions openfga_sdk/sync/api_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@
import re
import time
import urllib

from multiprocessing.pool import ThreadPool

from dateutil.parser import parse

import openfga_sdk.models

from openfga_sdk.sync import rest, oauth2
from openfga_sdk.configuration import Configuration
from openfga_sdk.exceptions import (
ApiException,
Expand All @@ -33,11 +32,9 @@
RateLimitExceededError,
ServiceException,
)
from openfga_sdk.sync import oauth2, rest
from openfga_sdk.telemetry import Telemetry
from openfga_sdk.telemetry.attributes import TelemetryAttribute, TelemetryAttributes


DEFAULT_USER_AGENT = "openfga-sdk python/0.9.1"


Expand Down
18 changes: 8 additions & 10 deletions openfga_sdk/sync/client/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@
NOTE: This file was auto generated by OpenAPI Generator (https://openapi-generator.tech). DO NOT EDIT.
"""

import uuid

from concurrent.futures import ThreadPoolExecutor

from openfga_sdk.sync.api_client import ApiClient
from openfga_sdk.sync.open_fga_api import OpenFgaApi
from openfga_sdk.client.configuration import ClientConfiguration
from openfga_sdk.client.models.assertion import ClientAssertion
from openfga_sdk.client.models.batch_check_item import (
Expand All @@ -32,18 +30,18 @@
from openfga_sdk.client.models.client_batch_check_response import (
ClientBatchCheckClientResponse,
)
from openfga_sdk.client.models.tuple import ClientTuple, convert_tuple_keys
from openfga_sdk.client.models.write_request import ClientWriteRequest
from openfga_sdk.client.models.write_response import ClientWriteResponse
from openfga_sdk.client.models.expand_request import ClientExpandRequest
from openfga_sdk.client.models.list_objects_request import ClientListObjectsRequest
from openfga_sdk.client.models.list_relations_request import ClientListRelationsRequest
from openfga_sdk.client.models.list_users_request import ClientListUsersRequest
from openfga_sdk.client.models.read_changes_request import ClientReadChangesRequest
from openfga_sdk.client.models.tuple import ClientTuple, convert_tuple_keys
from openfga_sdk.client.models.write_request import ClientWriteRequest
from openfga_sdk.client.models.write_response import ClientWriteResponse
from openfga_sdk.client.models.write_single_response import (
construct_write_single_response,
)
from openfga_sdk.client.models.write_transaction_opts import WriteTransactionOpts
from openfga_sdk.client.models.read_changes_request import ClientReadChangesRequest
from openfga_sdk.exceptions import (
AuthenticationError,
FgaValidationException,
Expand Down Expand Up @@ -72,10 +70,10 @@
WriteAuthorizationModelRequest,
)
from openfga_sdk.models.write_request import WriteRequest
from openfga_sdk.sync.api_client import ApiClient
from openfga_sdk.sync.open_fga_api import OpenFgaApi
from openfga_sdk.validation import is_well_formed_ulid_string

import uuid
from concurrent.futures import ThreadPoolExecutor

CLIENT_METHOD_HEADER = "X-OpenFGA-Client-Method"
CLIENT_BULK_REQUEST_ID_HEADER = "X-OpenFGA-Client-Bulk-Request-Id"
Expand Down
25 changes: 5 additions & 20 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,44 +33,29 @@ indent-width = 4

target-version = "py310"

[tool.ruff.lint]
extend-select = [
#"B", # flake8-bugbear
#"C4", # flake8-comprehensions
#"C9", # mccabe
"I", # isort
#"PGH", # pygrep-hooks
#"RUF", # ruff
#"UP", # pyupgrade
#"W", # pycodestyle
#"YTT", # flake8-2020
#"TRY", # tryceratops
#"EM", # flake8-errmsg
]
[lint]
select = ["E4", "E7", "E9", "F"]
ignore = []

fixable = ["ALL"]
unfixable = []

dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"

[tool.ruff.lint.isort]
lines-between-types = 1
lines-after-imports = 2

[tool.ruff.format]
[format]
quote-style = "double"
indent-style = "space"
skip-magic-trailing-comma = false
line-ending = "auto"

[tool.pytest.ini_options]
testpaths = [
"test",
"tests",
"integration",
]

addopts = "--cov=openfga_sdk --cov-report term-missing --cov-report xml --cov-report html"

asyncio_mode = "strict"
asyncio_default_fixture_loop_scope = "function"
asyncio_default_test_loop_scope = "function"
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"""

import pathlib

import pkg_resources

from setuptools import find_packages, setup
Expand Down
4 changes: 1 addition & 3 deletions test/configuration_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@
NOTE: This file was auto generated by OpenAPI Generator (https://openapi-generator.tech). DO NOT EDIT.
"""

import pytest
import copy

from unittest.mock import Mock

import pytest

from openfga_sdk.configuration import Configuration, RetryParams
from openfga_sdk.exceptions import ApiValueError, FgaValidationException

Expand Down
1 change: 1 addition & 0 deletions test/telemetry/attributes_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from openfga_sdk.models.batch_check_request import BatchCheckRequest
from openfga_sdk.models.check_request import CheckRequest
from openfga_sdk.rest import RESTResponse

from openfga_sdk.telemetry.attributes import (
TelemetryAttributes,
)
Expand Down
2 changes: 1 addition & 1 deletion test/telemetry/utilities_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
NOTE: This file was auto generated by OpenAPI Generator (https://openapi-generator.tech). DO NOT EDIT.
"""

from unittest.mock import MagicMock
from mock import MagicMock

from openfga_sdk.telemetry.utilities import doesInstanceHaveCallable

Expand Down

0 comments on commit a493fb2

Please sign in to comment.