chore: removed nilai-auth and moved nuc-helpers to nilai_api/auth

nilai-api/pyproject.toml

@@ -5,8 +5,7 @@ description = "Add your description here"
 readme = "README.md"
 authors = [
     { name = "José Cabrero-Holgueras", email = "[email protected]" },
-    { name = "Manuel Santos", email = "[email protected]" },
-    { name = "Dimitris Mouris", email = "[email protected]" }
+    { name = "Baptiste Lefort", email = "[email protected]" }
 ]
 requires-python = ">=3.12"
 dependencies = [
@@ -31,13 +30,12 @@ dependencies = [
     "verifier",
     "web3>=7.8.0",
     "click>=8.1.8",
-    "nuc-helpers",
     "nuc>=0.1.0",
     "pyyaml>=6.0.1",
     "trafilatura>=1.7.0",
     "secretvaults",
     "e2b-code-interpreter>=1.0.3",
-    "nilauth-credit-middleware>=0.1.1",
+    "nilauth-credit-middleware>=0.1.0",
 ]
 
 
@@ -47,7 +45,6 @@ build-backend = "hatchling.build"
 
 [tool.uv.sources]
 nilai-common = { workspace = true }
-nuc-helpers = { workspace = true }
 
 # TODO: Remove this once the secretvaults package is released with the fix
 secretvaults = { git = "https://github.com/jcabrero/secretvaults-py", rev = "main" }

nilai-api/src/nilai_api/auth/__init__.py

@@ -8,7 +8,7 @@
 from nilai_api.auth.strategies import AuthenticationStrategy
 
 from nuc.validate import ValidationException
-from nuc_helpers.usage import UsageLimitError
+from nilai_api.auth.nuc_helpers.usage import UsageLimitError
 
 from nilai_api.auth.common import (
     AuthenticationInfo,

nilai-api/src/nilai_api/auth/common.py

@@ -2,8 +2,8 @@
 from typing import Optional
 from fastapi import HTTPException, status
 from nilai_api.db.users import UserData
-from nuc_helpers.usage import TokenRateLimits, TokenRateLimit
-from nuc_helpers.nildb_document import PromptDocument
+from nilai_api.auth.nuc_helpers.usage import TokenRateLimits, TokenRateLimit
+from nilai_api.auth.nuc_helpers.nildb_document import PromptDocument
 
 
 class AuthenticationError(HTTPException):

nilai-api/src/nilai_api/auth/nuc.py

@@ -9,8 +9,8 @@
 
 from nilai_common.logger import setup_logger
 
-from nuc_helpers.usage import TokenRateLimits
-from nuc_helpers.nildb_document import PromptDocument
+from nilai_api.auth.nuc_helpers.usage import TokenRateLimits
+from nilai_api.auth.nuc_helpers.nildb_document import PromptDocument
 
 logger = setup_logger(__name__)
 

nilai-auth/nuc-helpers/src/nuc_helpers/__init__.py → nilai-api/src/nilai_api/auth/nuc_helpers/__init__.py

@@ -1,7 +1,4 @@
-from nuc_helpers.helpers import (
-    RootToken,
-    DelegationToken,
-    InvocationToken,
+from nilai_api.auth.nuc_helpers.helpers import (
     get_wallet_and_private_key,
     pay_for_subscription,
     get_root_token,
@@ -10,11 +7,11 @@
     get_nilai_public_key,
     get_nilauth_public_key,
     validate_token,
-    NilAuthPublicKey,
-    NilAuthPrivateKey,
-    NilchainPrivateKey,
 )
+from cosmpy.crypto.keypairs import PrivateKey as NilchainPrivateKey
+from secp256k1 import PublicKey as NilAuthPublicKey, PrivateKey as NilAuthPrivateKey
 
+from nilai_api.auth.nuc_helpers.types import RootToken, DelegationToken, InvocationToken
 
 __all__ = [
     "RootToken",

nilai-auth/nuc-helpers/src/nuc_helpers/helpers.py → nilai-api/src/nilai_api/auth/nuc_helpers/helpers.py

@@ -5,7 +5,12 @@
 import httpx
 
 # Importing the types
-from nuc_helpers.types import RootToken, DelegationToken, InvocationToken, ChainId
+from nilai_api.auth.nuc_helpers.types import (
+    RootToken,
+    DelegationToken,
+    InvocationToken,
+    ChainId,
+)
 
 # Importing the secp256k1 library dependencies
 from secp256k1 import PrivateKey as NilAuthPrivateKey, PublicKey as NilAuthPublicKey

nilai-auth/nuc-helpers/src/nuc_helpers/main.py → nilai-api/src/nilai_api/auth/nuc_helpers/main.py

@@ -1,4 +1,4 @@
-from nuc_helpers import (
+from nilai_api.auth.nuc_helpers import (
     get_wallet_and_private_key,
     pay_for_subscription,
     get_root_token,

nilai-api/src/nilai_api/auth/strategies.py

@@ -2,7 +2,6 @@
 from datetime import datetime, timezone
 
 from nilai_api.db.users import UserManager, UserModel, UserData
-from nilai_api.auth.jwt import validate_jwt
 from nilai_api.auth.nuc import (
     validate_nuc,
     get_token_rate_limit,
@@ -81,32 +80,6 @@ async def api_key_strategy(api_key: str) -> AuthenticationInfo:
     raise AuthenticationError("Missing or invalid API key")
 
 
-@allow_token(CONFIG.docs.token)
-async def jwt_strategy(jwt_creds: str) -> AuthenticationInfo:
-    result = validate_jwt(jwt_creds)
-    user_model: Optional[UserModel] = await UserManager.check_api_key(
-        result.user_address
-    )
-    if user_model:
-        return AuthenticationInfo(
-            user=UserData.from_sqlalchemy(user_model),
-            token_rate_limit=None,
-            prompt_document=None,
-        )
-    else:
-        user_model = UserModel(
-            userid=result.user_address,
-            name=result.pub_key,
-            apikey=result.user_address,
-        )
-        await UserManager.insert_user_model(user_model)
-        return AuthenticationInfo(
-            user=UserData.from_sqlalchemy(user_model),
-            token_rate_limit=None,
-            prompt_document=None,
-        )
-
-
 @allow_token(CONFIG.docs.token)
 async def nuc_strategy(nuc_token) -> AuthenticationInfo:
     """
@@ -139,7 +112,6 @@ async def nuc_strategy(nuc_token) -> AuthenticationInfo:
 
 class AuthenticationStrategy(Enum):
     API_KEY = (api_key_strategy, "API Key")
-    JWT = (jwt_strategy, "JWT")
     NUC = (nuc_strategy, "NUC")
 
     async def __call__(self, *args, **kwargs) -> AuthenticationInfo: