bump: version 0.1.4

Author: doubledare704

.github/workflows/publish.yml

@@ -26,33 +26,33 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    
+
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
         python-version: '3.9'
-    
+
     - name: Install build dependencies
       run: |
         python -m pip install --upgrade pip
         pip install build twine
-    
+
     - name: Build package
       run: python -m build
-    
+
     - name: Check distribution
       run: twine check dist/*
-    
+
     - name: Publish to Test PyPI
       env:
         TWINE_USERNAME: __token__
         TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }}
         TWINE_REPOSITORY_URL: https://test.pypi.org/legacy/
       run: twine upload --skip-existing dist/*
-    
+
     - name: Publish to PyPI
       if: github.event_name == 'release' && github.event.release.prerelease == false
       env:
         TWINE_USERNAME: __token__
         TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
-      run: twine upload dist/*
+      run: twine upload dist/*

.github/workflows/test.yml

@@ -15,19 +15,19 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    
+
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
-    
+
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements-dev.txt
-    
+
     - name: Run tests
       run: pytest --cov=aiowhitebit
-    
+
     - name: Run black
-      run: black --check .
+      run: black --check .

.gitignore

@@ -3,4 +3,4 @@
 .idea
 __pycache__/
 *.py[cod]
-*$py.class
+*$py.class

.pre-commit-config.yaml

@@ -1,14 +1,24 @@
+exclude: ^examples/
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v5.0.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: check-yaml
+    -   id: check-toml
     -   id: check-added-large-files
+    -   id: debug-statements
+    -   id: requirements-txt-fixer
 
--   repo: https://github.com/psf/black
-    rev: 23.3.0
+-   repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.11.5
     hooks:
-    -   id: black
-        args: [--line-length=120]
+    -   id: ruff
+        args: [--fix, --exit-non-zero-on-fix]
+    -   id: ruff-format
+
+-   repo: https://github.com/RobertCraigie/pyright-python
+    rev: v1.1.399
+    hooks:
+    -   id: pyright

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## [0.1.1] - 2024-03-14
+## [0.1.4] - 2024-03-XX
+
+### Added
+- Support for Pydantic v2 while maintaining compatibility with v1.10.21
+- Fixed MaintenanceStatus model to handle both string and integer status values
+
+## [0.1.3] - 2024-03-14
 
 ### Added
 - Initial release

LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -29,11 +29,11 @@ from aiowhitebit.clients.public import PublicV4Client
 
 async def main():
     client = PublicV4Client()
-    
+
     # Get market info
     markets = await client.get_market_info()
     print(f"Number of markets: {len(markets)}")
-    
+
     # Get market activity
     activity = await client.get_market_activity()
     print(f"BTC_USDT last price: {activity.get('BTC_USDT').last_price}")

aiowhitebit/clients/__init__.py

@@ -1,11 +1,11 @@
 """Clients for the WhiteBit API."""
 
-from aiowhitebit.clients.public import PublicV1Client, PublicV2Client, PublicV4Client
 from aiowhitebit.clients.private import PrivateV4Client
+from aiowhitebit.clients.public import PublicV1Client, PublicV2Client, PublicV4Client
+from aiowhitebit.clients.webhook import WebhookDataLoader, get_webhook_data_loader
 from aiowhitebit.clients.websocket import (
     PublicWebSocketClient,
-    get_public_websocket_client,
     SubscribeRequest,
+    get_public_websocket_client,
     ws_subscribe_builder,
 )
-from aiowhitebit.clients.webhook import WebhookDataLoader, get_webhook_data_loader

aiowhitebit/clients/base.py

@@ -1,13 +1,14 @@
 """Base client functionality for the WhiteBit API."""
+
 from asyncio import Semaphore
-from typing import Any, Optional, TypeVar, Callable
+from typing import Any, Callable, Optional, TypeVar
 
 import aiohttp
 
 from aiowhitebit.constants import BASE_URL
 from aiowhitebit.exceptions import WhitebitAPIError
 
-T = TypeVar('T')
+T = TypeVar("T")
 
 
 class HTTPClient:
@@ -50,13 +51,7 @@ def __init__(self, base_url: str = BASE_URL):
     def request_url(self, path: str) -> str:
         return f"{self.base_url}{path}"
 
-    async def _make_request(
-            self,
-            path: str,
-            converter: Optional[Callable[[dict], T]] = None
-    ) -> T:
+    async def _make_request(self, path: str, converter: Optional[Callable[[dict], T]] = None) -> T:
         full_url = self.request_url(path)
         json_obj = await self.get(full_url)
         return converter(json_obj) if converter else json_obj
-
-

aiowhitebit/clients/private/v4.py

@@ -5,39 +5,39 @@
 import hmac
 import json
 import time
-from typing import Optional, Union, List, Callable
+from typing import Callable, List, Optional, Union
 
 import aiohttp
 from pydantic import BaseModel
 
-from aiowhitebit.constants import BASE_URL, API_KEY, SECRET_KEY
+from aiowhitebit.constants import API_KEY, BASE_URL, SECRET_KEY
 from aiowhitebit.converters.private import (
+    convert_active_orders_to_dto,
+    convert_cancel_order_to_dto,
     convert_executed_deals_to_dto,
     convert_executed_orders_by_market_to_dto,
     convert_executed_orders_to_dto,
-    convert_active_orders_to_dto,
-    convert_cancel_order_to_dto,
-    convert_order_response_to_dto,
     convert_get_trading_balance_to_dto,
+    convert_order_response_to_dto,
 )
 from aiowhitebit.exceptions import handle_errors
 from aiowhitebit.models.private import (
-    TradingBalanceItem,
-    TradingBalanceList,
+    ActiveOrdersRequest,
+    CancelOrderRequest,
+    CancelOrderResponse,
     CreateLimitOrderRequest,
     CreateOrderResponse,
     CreateStockMarketOrderRequest,
     CreateStopLimitOrderRequest,
     CreateStopMarketOrderRequest,
-    CancelOrderRequest,
-    CancelOrderResponse,
-    ActiveOrdersRequest,
-    ExecutedOrderHistoryRequest,
-    ExecutedOrdersResponse,
-    ExecutedOrderDealsRequest,
     ExecutedDealsResponse,
+    ExecutedOrderDealsRequest,
+    ExecutedOrderHistoryRequest,
     ExecutedOrdersByMarket,
     ExecutedOrdersByMarketResponse,
+    ExecutedOrdersResponse,
+    TradingBalanceItem,
+    TradingBalanceList,
 )