fix: lib exporting issue

HinsonSIDAN · HinsonSIDAN · commit a7e78f7e1721 · 2025-09-01T14:52:45.000-07:00
diff --git a/.env.example b/.env.example
@@ -1,3 +1,3 @@
 TRADING_PASSWORD="xxxxxxxx"
 DELTADEFI_API_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-BASE_URL="http://localhost:8080"
+BASE_URL="http://localhost:8080"
diff --git a/.gitignore b/.gitignore
@@ -59,4 +59,4 @@ docs/_build/
 
 # OS
 .DS_Store
-Thumbs.db
+Thumbs.db
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,67 @@
+repos:
+  # Standard pre-commit hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-added-large-files
+      - id: check-json
+      - id: check-toml
+      - id: check-merge-conflict
+      - id: debug-statements
+
+  # Ruff for linting and formatting
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.12.10
+    hooks:
+      - id: ruff
+        args: [--fix]
+      - id: ruff-format
+
+  # MyPy for type checking (lenient for now)
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.17.1
+    hooks:
+      - id: mypy
+        additional_dependencies: [types-requests]
+        args: [--ignore-missing-imports, --disable-error-code=no-any-return, --disable-error-code=call-arg]
+
+  # Custom hooks for project-specific checks
+  - repo: local
+    hooks:
+      # Install dependencies
+      - id: uv-sync
+        name: Install dependencies
+        entry: uv sync --dev
+        language: system
+        pass_filenames: false
+        stages: [pre-commit]
+
+      # Run tests
+      - id: pytest
+        name: Run tests
+        entry: uv run pytest
+        language: system
+        pass_filenames: false
+        stages: [pre-commit]
+
+      # Build package
+      - id: uv-build
+        name: Build package
+        entry: uv build --out-dir .pre-commit-build
+        language: system
+        pass_filenames: false
+        stages: [pre-commit]
+
+      # Clean up build artifacts
+      - id: cleanup-build
+        name: Clean build artifacts
+        entry: rm -rf .pre-commit-build
+        language: system
+        pass_filenames: false
+        stages: [pre-commit]
+
+# Configure which hooks run at different stages
+default_stages: [pre-commit]
diff --git a/Makefile b/Makefile
@@ -59,7 +59,7 @@ cov-html: cov ## Check code coverage and generate HTML report [test]
 	@$(UV) run coverage html -d cov_html
 	@echo "Coverage report generated in cov_html/"
 
-# 🏗️  Building & Distribution  
+# 🏗️  Building & Distribution
 build: install ## Build the package [build]
 	@$(UV) build
 
@@ -83,3 +83,12 @@ clean: clean-test ## Remove caches, build artifacts, and temp files
 version: ## Show uv and Python versions
 	@$(UV) --version
 	@$(UV) run $(PY) -c "import platform; print('Python', platform.python_version())"
+
+precommit-install: ## Install pre-commit hooks
+	@$(UV) run pre-commit install
+
+precommit: ## Run pre-commit hooks on all files
+	@$(UV) run pre-commit run --all-files
+
+precommit-update: ## Update pre-commit hooks
+	@$(UV) run pre-commit autoupdate
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "deltadefi"
-version = "0.1.0"
+version = "0.1.1"
 description = "Python SDK for DeltaDeFi protocol."
 readme = "README.md"
 requires-python = ">3.11,<4.0.0"
@@ -26,7 +26,7 @@ dependencies = [
     "sidan-gin>=0.1.6",
     "requests>=2.25.0",
     "certifi>=2024.8.30",
-    "charset-normalizer>=3.4.0", 
+    "charset-normalizer>=3.4.0",
     "idna>=3.10",
     "urllib3>=2.2.3",
     "pycardano>=0.12.3",
@@ -42,6 +42,8 @@ dev = [
     "ruff>=0.12.10",
     "mypy>=1.17.1",
     "twine>=5.0.0",
+    "build>=1.3.0",
+    "pre-commit>=4.3.0",
 ]
 
 docs = [
@@ -54,6 +56,7 @@ docs = [
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
+
 [tool.ruff]
 line-length = 88
 target-version = "py311"
@@ -63,7 +66,7 @@ exclude = [
     ".venv",
     "__pycache__",
     "build",
-    "dist", 
+    "dist",
     ".pytest_cache",
     ".mypy_cache",
     ".ruff_cache",
diff --git a/src/deltadefi/api.py b/src/deltadefi/api.py
@@ -3,7 +3,7 @@
 import requests
 
 from deltadefi.error import ClientError, ServerError
-from deltadefi.lib.utils import clean_none_value, encoded_string
+from deltadefi.utils import clean_none_value, encoded_string
 
 
 class API:
diff --git a/src/deltadefi/clients/accounts.py b/src/deltadefi/clients/accounts.py
@@ -3,7 +3,6 @@
 from sidan_gin import Asset, UTxO
 
 from deltadefi.api import API
-from deltadefi.lib.utils import check_required_parameter, check_required_parameters
 from deltadefi.models.models import OrderStatusType
 from deltadefi.responses import (
     BuildDepositTransactionResponse,
@@ -22,6 +21,7 @@
     GetOrderRecordsResponse,
     SubmitTransferalTransactionResponse,
 )
+from deltadefi.utils import check_required_parameter, check_required_parameters
 
 
 class Accounts(API):
diff --git a/src/deltadefi/clients/markets.py b/src/deltadefi/clients/markets.py
@@ -1,8 +1,8 @@
 from typing import Literal
 
 from deltadefi.api import API
-from deltadefi.lib.utils import check_required_parameter, check_required_parameters
 from deltadefi.responses import GetAggregatedPriceResponse, GetMarketPriceResponse
+from deltadefi.utils import check_required_parameter, check_required_parameters
 
 
 class Market(API):
diff --git a/src/deltadefi/clients/orders.py b/src/deltadefi/clients/orders.py
@@ -1,11 +1,11 @@
 from deltadefi.api import API
-from deltadefi.lib.utils import check_required_parameter, check_required_parameters
 from deltadefi.models.models import OrderSide, OrderType
 from deltadefi.responses import (
     BuildCancelOrderTransactionResponse,
     BuildPlaceOrderTransactionResponse,
     SubmitPlaceOrderTransactionResponse,
 )
+from deltadefi.utils import check_required_parameter, check_required_parameters
 
 
 class Order(API):
diff --git a/src/deltadefi/lib/__init__.py b/src/deltadefi/lib/__init__.py
diff --git a/src/deltadefi/utils/__init__.py b/src/deltadefi/utils/__init__.py
@@ -0,0 +1,2 @@
+# flake8: noqa
+from .helpers import *
diff --git a/src/deltadefi/utils/helpers.py b/src/deltadefi/utils/helpers.py
@@ -9,7 +9,7 @@
 
 def clean_none_value(d) -> dict:
     out = {}
-    for k in d.keys():
+    for k in d:
         if d[k] is not None:
             out[k] = d[k]
     return out
@@ -33,7 +33,7 @@ def check_required_parameters(params):
 
 
 def check_enum_parameter(value, enum_class):
-    if value not in set(item.value for item in enum_class):
+    if value not in {item.value for item in enum_class}:
         raise ParameterValueError([value])
 
 
diff --git a/tests/clients/test_accounts.py b/tests/clients/test_accounts.py
@@ -2,19 +2,22 @@
 import os
 import unittest
 
+import dotenv
+
 from deltadefi.clients import ApiClient
 from deltadefi.responses import GetAccountBalanceResponse
 from deltadefi.responses.accounts import GetOperationKeyResponse
 
+dotenv.load_dotenv()
+
 
 class TestAccounts(unittest.TestCase):
     def setUp(self):
         api_key = os.getenv("DELTADEFI_API_KEY")
-        base_url = os.getenv("BASE_URL", "http://localhost:8080")
         print(api_key)
         if not api_key:
             self.skipTest("DELTADEFI_API_KEY not set in environment variables")
-        self.api = ApiClient(api_key=api_key, base_url=base_url)
+        self.api = ApiClient(api_key=api_key)
 
     def test_get_operation_key(self):
         response: GetOperationKeyResponse = self.api.accounts.get_operation_key()
diff --git a/tests/clients/test_order.py b/tests/clients/test_order.py
@@ -2,20 +2,23 @@
 import os
 import unittest
 
-from sidan_gin import Wallet
+import dotenv
 
 from deltadefi.clients import ApiClient
 from deltadefi.responses import PostOrderResponse
 
+dotenv.load_dotenv()
+
 
 class TestOrder(unittest.TestCase):
     def setUp(self):
         api_key = os.getenv("DELTADEFI_API_KEY")
         password = os.getenv("TRADING_PASSWORD")
-        base_url = os.getenv("BASE_URL", "http://localhost:8080")
         if not api_key:
             self.skipTest("DELTADEFI_API_KEY not set in environment variables")
-        api = ApiClient(api_key=api_key, base_url=base_url)
+        if not password:
+            self.skipTest("TRADING_PASSWORD not set in environment variables")
+        api = ApiClient(api_key=api_key)
         api.load_operation_key(password)
         self.api = api
 
diff --git a/uv.lock b/uv.lock
