Skip to content

Commit 85c686d

Browse files
matsk-sinchmatsk-sinch
committed
refactor: endpoint imports
1 parent 6a46de2 commit 85c686d

27 files changed

+50
-51
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Each API throws a custom, API related exception for an unsuccessful backed call.
135135
Example for Numbers API:
136136

137137
```python
138-
from sinch.domains.numbers.exceptions import NumbersException
138+
from sinch.domains.numbers.api.v1.exceptions import NumbersException
139139

140140
try:
141141
nums = sinch_client.numbers.available.list(

‎sinch/domains/numbers/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from sinch.domains.numbers.api.v1.available_numbers.available_numbers_apis import AvailableNumbers
2-
from sinch.domains.numbers.api.v1.active_numbers.active_numbers_apis import (
1+
from sinch.domains.numbers.api.v1.available_numbers_apis import AvailableNumbers
2+
from sinch.domains.numbers.api.v1 import (
33
ActiveNumbers, ActiveNumbersWithAsyncPagination
44
)
55
from sinch.domains.numbers.endpoints.callbacks.get_configuration import GetNumbersCallbackConfigurationEndpoint

‎sinch/domains/numbers/api/v1/__init__.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from sinch.domains.numbers.api.v1.active_numbers_apis import ActiveNumbers, ActiveNumbersWithAsyncPagination
2+
3+
__all__ = [
4+
"ActiveNumbers",
5+
"ActiveNumbersWithAsyncPagination"
6+
]

‎sinch/domains/numbers/api/v1/active_numbers/__init__.py

-10
This file was deleted.

‎sinch/domains/numbers/api/v1/active_numbers/active_numbers_apis.py ‎sinch/domains/numbers/api/v1/active_numbers_apis.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from typing import Optional
22
from pydantic import StrictStr, StrictInt
33
from sinch.core.pagination import TokenBasedPaginator, AsyncTokenBasedPaginator, Paginator
4-
from sinch.domains.numbers.base_numbers import BaseNumbers
5-
from sinch.domains.numbers.api.v1.active_numbers import ListActiveNumbersEndpoint
4+
from sinch.domains.numbers.api.v1.base_numbers import BaseNumbers
5+
from sinch.domains.numbers.api.v1.internal import ListActiveNumbersEndpoint
66
from sinch.domains.numbers.endpoints.active import (
77
GetNumberConfigurationEndpoint, ReleaseNumberFromProjectEndpoint,
88
UpdateNumberConfigurationEndpoint

‎sinch/domains/numbers/api/v1/available_numbers/__init__.py

-10
This file was deleted.

‎sinch/domains/numbers/api/v1/available_numbers/available_numbers_apis.py ‎sinch/domains/numbers/api/v1/available_numbers_apis.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from typing import Optional, overload
22
from pydantic import StrictInt, StrictStr
3-
from sinch.domains.numbers.base_numbers import BaseNumbers
3+
from sinch.domains.numbers.api.v1.base_numbers import BaseNumbers
44
from sinch.domains.numbers.models.v1 import CheckNumberAvailabilityResponse, RentAnyNumberResponse
5-
from sinch.domains.numbers.api.v1.available_numbers import (
5+
from sinch.domains.numbers.api.v1.internal import (
66
ActivateNumberEndpoint, AvailableNumbersEndpoint, RentAnyNumberEndpoint, SearchForNumberEndpoint
77
)
88
from sinch.domains.numbers.models.v1.shared_params.available_number import AvailableNumber

‎sinch/domains/numbers/base_numbers.py ‎sinch/domains/numbers/api/v1/base_numbers.py

File renamed without changes.

‎sinch/domains/numbers/exceptions.py ‎sinch/domains/numbers/api/v1/exceptions.py

File renamed without changes.

‎sinch/domains/numbers/api/v1/internal/__init__.py

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
from sinch.domains.numbers.api.v1.internal.available_numbers_endpoints import (
2+
ActivateNumberEndpoint, AvailableNumbersEndpoint, RentAnyNumberEndpoint, SearchForNumberEndpoint
3+
)
4+
from sinch.domains.numbers.api.v1.internal.active_numbers_endpoints import ListActiveNumbersEndpoint
5+
6+
7+
__all__ = [
8+
"ActivateNumberEndpoint",
9+
"AvailableNumbersEndpoint",
10+
"RentAnyNumberEndpoint",
11+
"SearchForNumberEndpoint",
12+
"ListActiveNumbersEndpoint"
13+
]

‎sinch/domains/numbers/api/v1/active_numbers/active_numbers_endpoints.py ‎sinch/domains/numbers/api/v1/internal/active_numbers_endpoints.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from sinch.core.models.http_response import HTTPResponse
2-
from sinch.domains.numbers.numbers_endpoint import NumbersEndpoint
2+
from sinch.domains.numbers.api.v1.internal.numbers_endpoint import NumbersEndpoint
33
from sinch.core.enums import HTTPAuthentication, HTTPMethods
44
from sinch.domains.numbers.models.v1.internal import ListActiveNumbersRequest, ListActiveNumbersResponse
55

‎sinch/domains/numbers/api/v1/available_numbers/available_numbers_endpoints.py ‎sinch/domains/numbers/api/v1/internal/available_numbers_endpoints.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import json
22
from sinch.core.enums import HTTPAuthentication, HTTPMethods
33
from sinch.core.models.http_response import HTTPResponse
4-
from sinch.domains.numbers.models.v1.shared_params.available_number import AvailableNumber
5-
from sinch.domains.numbers.models.v1.shared_params import ActiveNumber
6-
from sinch.domains.numbers.models.v1 import (
7-
CheckNumberAvailabilityResponse, RentAnyNumberResponse
8-
)
9-
from sinch.domains.numbers.numbers_endpoint import NumbersEndpoint
10-
from sinch.domains.numbers.exceptions import NumberNotFoundException, NumbersException
114
from sinch.domains.numbers.models.v1.internal import (
125
ActivateNumberRequest, CheckNumberAvailabilityRequest, ListAvailableNumbersRequest, RentAnyNumberRequest,
136
ListAvailableNumbersResponse
147
)
8+
from sinch.domains.numbers.models.v1.shared_params import AvailableNumber, ActiveNumber
9+
from sinch.domains.numbers.models.v1 import (
10+
CheckNumberAvailabilityResponse, RentAnyNumberResponse
11+
)
12+
from sinch.domains.numbers.api.v1.internal.numbers_endpoint import NumbersEndpoint
13+
from sinch.domains.numbers.api.v1.exceptions import NumberNotFoundException, NumbersException
14+
1515

1616

1717
class ActivateNumberEndpoint(NumbersEndpoint):

‎sinch/domains/numbers/numbers_endpoint.py ‎sinch/domains/numbers/api/v1/internal/numbers_endpoint.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from sinch.core.models.http_response import HTTPResponse
44
from sinch.core.endpoint import HTTPEndpoint
55
from sinch.core.types import BM
6-
from sinch.domains.numbers.exceptions import NumbersException
6+
from sinch.domains.numbers.api.v1.exceptions import NumbersException
77
from sinch.domains.numbers.models.v1.errors import NotFoundError
88

99

‎sinch/domains/numbers/endpoints/active/get_number_configuration.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from sinch.core.models.http_response import HTTPResponse
2-
from sinch.domains.numbers.numbers_endpoint import NumbersEndpoint
2+
from sinch.domains.numbers.api.v1.internal.numbers_endpoint import NumbersEndpoint
33
from sinch.core.enums import HTTPAuthentication, HTTPMethods
44

55
from sinch.domains.numbers.models.active.requests import GetNumberConfigurationRequest

‎sinch/domains/numbers/endpoints/active/release_number_from_project.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from sinch.core.models.http_response import HTTPResponse
2-
from sinch.domains.numbers.numbers_endpoint import NumbersEndpoint
2+
from sinch.domains.numbers.api.v1.internal.numbers_endpoint import NumbersEndpoint
33
from sinch.core.enums import HTTPAuthentication, HTTPMethods
44
from sinch.domains.numbers.models.active.requests import ReleaseNumberFromProjectRequest
55
from sinch.domains.numbers.models.active.responses import ReleaseNumberFromProjectResponse

‎sinch/domains/numbers/endpoints/active/update_number_configuration.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from sinch.core.models.http_response import HTTPResponse
2-
from sinch.domains.numbers.numbers_endpoint import NumbersEndpoint
2+
from sinch.domains.numbers.api.v1.internal.numbers_endpoint import NumbersEndpoint
33
from sinch.core.enums import HTTPAuthentication, HTTPMethods
44
from sinch.domains.numbers.models.active.requests import UpdateNumberConfigurationRequest
55
from sinch.domains.numbers.models.active.responses import UpdateNumberConfigurationResponse

‎sinch/domains/numbers/endpoints/callbacks/get_configuration.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from sinch.core.models.http_response import HTTPResponse
2-
from sinch.domains.numbers.numbers_endpoint import NumbersEndpoint
2+
from sinch.domains.numbers.api.v1.internal.numbers_endpoint import NumbersEndpoint
33
from sinch.core.enums import HTTPAuthentication, HTTPMethods
44
from sinch.domains.numbers.models.callbacks.responses import GetNumbersCallbackConfigurationResponse
55

‎sinch/domains/numbers/endpoints/callbacks/update_configuration.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from sinch.core.models.http_response import HTTPResponse
2-
from sinch.domains.numbers.numbers_endpoint import NumbersEndpoint
2+
from sinch.domains.numbers.api.v1.internal.numbers_endpoint import NumbersEndpoint
33
from sinch.core.enums import HTTPAuthentication, HTTPMethods
44
from sinch.domains.numbers.models.callbacks.responses import UpdateNumbersCallbackConfigurationResponse
55
from sinch.domains.numbers.models.callbacks.requests import UpdateNumbersCallbackConfigurationRequest

‎sinch/domains/numbers/endpoints/regions/list_available_regions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from sinch.core.models.http_response import HTTPResponse
2-
from sinch.domains.numbers.numbers_endpoint import NumbersEndpoint
2+
from sinch.domains.numbers.api.v1.internal.numbers_endpoint import NumbersEndpoint
33
from sinch.core.enums import HTTPAuthentication, HTTPMethods
44
from sinch.domains.numbers.models.regions import Region
55

‎tests/e2e/numbers/features/steps/numbers.steps.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from datetime import timezone, datetime
33
from behave import given, when, then
44
from decimal import Decimal
5-
from sinch.domains.numbers.exceptions import NumberNotFoundException
5+
from sinch.domains.numbers.api.v1.exceptions import NumberNotFoundException
66
from sinch.domains.numbers.models.v1 import RentAnyNumberResponse
77
from sinch.domains.numbers.models.v1.errors import NotFoundError
88
from sinch.domains.numbers.models.v1.shared_params import ActiveNumber

‎tests/unit/domains/numbers/v1/endpoints/active/test_list_active_numbers_endpoint.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from decimal import Decimal
33

44
import pytest
5-
from sinch.domains.numbers.api.v1.active_numbers.active_numbers_endpoints import ListActiveNumbersEndpoint
5+
from sinch.domains.numbers.api.v1.internal.active_numbers_endpoints import ListActiveNumbersEndpoint
66
from sinch.domains.numbers.models.v1.internal import ListActiveNumbersRequest, ListActiveNumbersResponse
77
from sinch.core.models.http_response import HTTPResponse
88

‎tests/unit/domains/numbers/v1/endpoints/available/test_activate_number_endpoint.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pytest
22
import json
3-
from sinch.domains.numbers.api.v1.available_numbers import ActivateNumberEndpoint
3+
from sinch.domains.numbers.api.v1.internal import ActivateNumberEndpoint
44
from sinch.domains.numbers.models.v1.internal import ActivateNumberRequest
55
from sinch.core.models.http_response import HTTPResponse
66

‎tests/unit/domains/numbers/v1/endpoints/available/test_list_available_numbers_endpoint.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import pytest
2-
from sinch.domains.numbers.api.v1.available_numbers import AvailableNumbersEndpoint
2+
from sinch.domains.numbers.api.v1.internal import AvailableNumbersEndpoint
33
from sinch.domains.numbers.models.v1.internal import ListAvailableNumbersRequest
44
from sinch.core.models.http_response import HTTPResponse
55

‎tests/unit/domains/numbers/v1/endpoints/available/test_rent_any_number_endpoint.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import json
33
from datetime import datetime, timezone
44
from sinch.core.models.http_response import HTTPResponse
5-
from sinch.domains.numbers.api.v1.available_numbers.available_numbers_apis import RentAnyNumberEndpoint
5+
from sinch.domains.numbers.api.v1.available_numbers_apis import RentAnyNumberEndpoint
66
from sinch.domains.numbers.models.v1.internal import RentAnyNumberRequest
77
from sinch.domains.numbers.models.v1 import RentAnyNumberResponse
88

‎tests/unit/domains/numbers/v1/endpoints/available/test_search_for_number_endpoint.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import pytest
2-
from sinch.domains.numbers.api.v1.available_numbers import SearchForNumberEndpoint
2+
from sinch.domains.numbers.api.v1.internal import SearchForNumberEndpoint
33
from sinch.domains.numbers.models.v1.check_number_availability_response import CheckNumberAvailabilityResponse
44
from sinch.domains.numbers.models.v1.internal.check_number_availability_request import CheckNumberAvailabilityRequest
55
from sinch.core.models.http_response import HTTPResponse

‎tests/unit/domains/numbers/v1/test_available_numbers.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import pytest
22
from unittest.mock import MagicMock
33

4-
from sinch.domains.numbers.api.v1.available_numbers.available_numbers_apis import AvailableNumbers
5-
from sinch.domains.numbers.api.v1.available_numbers import (
4+
from sinch.domains.numbers.api.v1.available_numbers_apis import AvailableNumbers
5+
from sinch.domains.numbers.api.v1.internal import (
66
AvailableNumbersEndpoint, ActivateNumberEndpoint, SearchForNumberEndpoint
77
)
88
from sinch.domains.numbers.models.v1 import CheckNumberAvailabilityResponse

‎tests/unit/test_exceptions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from sinch.core.exceptions import ValidationException
2-
from sinch.domains.numbers.exceptions import NumbersException
2+
from sinch.domains.numbers.api.v1.exceptions import NumbersException
33
from sinch.domains.conversation.exceptions import ConversationException
44
from sinch.domains.sms.exceptions import SMSException
55
from sinch.domains.authentication.exceptions import AuthenticationException

0 commit comments

Comments
 (0)