crypticorn-utils 0.1.1rc1__py3-none-any.whl → 0.1.2__py3-none-any.whl

crypticorn_utils/auth.py

@@ -61,8 +61,8 @@ class AuthHandler:
         """
         Verifies the API key.
         """
-        # self.client.config.api_key = {apikey_header.scheme_name: api_key}
-        return await self.client.login.verify_api_key(api_key)
+        self.client.config.api_key = {"APIKeyHeader": api_key}
+        return await self.client.login.verify()
 
     async def _verify_bearer(
         self, bearer: HTTPAuthorizationCredentials
@@ -80,7 +80,7 @@ class AuthHandler:
         return await self.client.login.verify_basic_auth(basic.username, basic.password)
 
     async def _validate_scopes(
-        self, api_scopes: list[Scope], user_scopes: list[Scope]
+        self, api_scopes: list[str], user_scopes: list[str]
     ) -> bool:
         """
         Checks if the required scopes are a subset of the user scopes.
@@ -92,6 +92,10 @@ class AuthHandler:
                     message="Insufficient scopes to access this resource (required: "
                     + ", ".join(api_scopes)
                     + ")",
+                    details={
+                        "required_scopes": api_scopes,
+                        "granted_scopes": user_scopes,
+                    },
                 ),
             )
 
@@ -277,7 +281,12 @@ class AuthHandler:
                 if res is None:
                     continue
                 if sec:
-                    await self._validate_scopes(sec.scopes, res.scopes)
+                    required = [
+                        s.value if isinstance(s, Scope) else str(s)
+                        for s in sec.scopes
+                    ]
+                    granted = [str(s) for s in res.scopes]
+                    await self._validate_scopes(required, granted)
                 return res
 
             except Exception as e:

crypticorn_utils/enums.py

@@ -50,8 +50,6 @@ class Scope(StrEnum):
     READ_PAY_PAYMENTS = "read:pay:payments"
     READ_PAY_PRODUCTS = "read:pay:products"
     WRITE_PAY_PRODUCTS = "write:pay:products"
-    READ_PAY_NOW = "read:pay:now"
-    WRITE_PAY_NOW = "write:pay:now"
     WRITE_PAY_COUPONS = "write:pay:coupons"
     READ_PAY_COUPONS = "read:pay:coupons"
 

{crypticorn_utils-0.1.1rc1.dist-info → crypticorn_utils-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crypticorn_utils
-Version: 0.1.1rc1
+Version: 0.1.2
 Summary: Shared utilities for the Crypticorn APIs
 Author-email: Crypticorn <timon@crypticorn.com>
 License-Expression: MIT
@@ -26,6 +26,7 @@ Requires-Dist: psutil<8.0.0,>=7.0.0
 Requires-Dist: setuptools<81.0.0,>=80.0.0
 Requires-Dist: strenum
 Requires-Dist: prometheus-client<1.0.0,>=0.22.0
+Requires-Dist: crypticorn<3.0.0,>=2.17.0
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
 Requires-Dist: twine; extra == "dev"
@@ -42,7 +43,6 @@ Requires-Dist: pytest-cov==6.1.1; extra == "test"
 Requires-Dist: python-dotenv==1.0.1; extra == "test"
 Requires-Dist: PyJWT==2.10.0; extra == "test"
 Requires-Dist: httpx>=0.27.0; extra == "test"
-Requires-Dist: crypticorn>=2.17.0; extra == "test"
 Dynamic: license-file
 
 This module serves as a central place for providing utilities for our python backends.
@@ -68,6 +68,30 @@ This module serves as a central place for providing utilities for our python bac
 
 <!-- changelog-insertion -->
 
+## v0.1.2 (2025-07-22)
+
+### Bug Fixes
+
+- Failing scope comparison in some environments
+  ([`004495d`](https://github.com/crypticorn-ai/util-libraries/commit/004495da87b973f43b3e32abe96493dac1b6204a))
+
+
+## v0.1.1 (2025-07-20)
+
+
+## v0.1.1-rc.2 (2025-07-18)
+
+### Bug Fixes
+
+- Change verify api key request
+  ([`11af6c2`](https://github.com/crypticorn-ai/util-libraries/commit/11af6c2c12a92b0a4c1c3b83ba86aca2a401ac45))
+
+### Testing
+
+- Fix failing auth test
+  ([`03a3db1`](https://github.com/crypticorn-ai/util-libraries/commit/03a3db1341aaf51c6162454924cb929d6cfee94a))
+
+
 ## v0.1.1-rc.1 (2025-07-02)
 
 ### Bug Fixes

{crypticorn_utils-0.1.1rc1.dist-info → crypticorn_utils-0.1.2.dist-info}/RECORD

@@ -1,9 +1,9 @@
 crypticorn_utils/__init__.py,sha256=PlxMppwUMmbNR9Jr1z9DNCYAYnTuWzW9IFyGTwV5slA,700
 crypticorn_utils/_migration.py,sha256=YPVEDVIz9Lt3ntwrVmUtavQxsJVjtSqQeQ0A_qydiaY,445
 crypticorn_utils/ansi_colors.py,sha256=-tMlUTE8NI7TPv7uj0kGRe-SI2hGaUNPKBFI_dfiZy0,1392
-crypticorn_utils/auth.py,sha256=oJORAuYBD0qiAmUpbMe0JSvp_gsof3oQMNpqay8L6Ek,13018
+crypticorn_utils/auth.py,sha256=i0VE07eU3ALIfi7wEnUfLMK6x85SjrMqIif-LyXQ-i8,13370
 crypticorn_utils/decorators.py,sha256=chsbF27_q3hC0egBaZLfv2vcqUcBSfQXRkLi3Ewb-20,1063
-crypticorn_utils/enums.py,sha256=KU1W98dkAPQ7-9YAsEhjUwX-Qd79Fze5dzPRP6MkBks,5025
+crypticorn_utils/enums.py,sha256=gIiEhMJDTla4HnW1AcGYHG2IA_VAby-Nu8BFHyFlDxM,4955
 crypticorn_utils/errors.py,sha256=mzQZsD8mFPQY6RJLqN_yw9n4CNoo3pEsNh8-v8n_n_o,30440
 crypticorn_utils/exceptions.py,sha256=iHJOtEBrqgzZVa3ZC60TVYpEfUnhxzos_A9QefmVXT8,6633
 crypticorn_utils/logging.py,sha256=510DSQr4g5UbweSvZAxjdUKtmj-LU3Dw0clARaAvsZA,4439
@@ -14,17 +14,11 @@ crypticorn_utils/openapi.py,sha256=D8bCpCVVzYQptHrJ7SYOgCxI3R_d0cjW9KMOBq-x0xk,2
 crypticorn_utils/pagination.py,sha256=06shym28tfD-Cc9EPk2W7K2GHqUj2Kk4ShQ0BrKCDWY,11432
 crypticorn_utils/utils.py,sha256=DXIOjJCdrDqoNCLAtohWYrFnEd1nvmg9NXdL07yWAgk,3137
 crypticorn_utils/warnings.py,sha256=ErEB108UVZgV5ykSuFkjQgDTb9sb_T9yKq-h753Kw64,3085
-crypticorn_utils/cli/__init__.py,sha256=5qIQ_WXKSoJk3tGU6n0XwmSX8a2cDRSM6dncaU1qOZ4,123
-crypticorn_utils/cli/__main__.py,sha256=q_3MdBGUJPukr_xexup3TICf8kLL7Tp4JxLWB5XCESs,303
-crypticorn_utils/cli/init.py,sha256=Ubu0eOwUqVweb4EzqsceV4K5VMN2qz6_Riy9h2Pjb64,4099
-crypticorn_utils/cli/version.py,sha256=OVDxeL80eMgZsFgw2cDSzFfuaRToDfnYAVOQTpkoMWs,206
-crypticorn_utils/cli/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-crypticorn_utils/cli/templates/auth.py,sha256=i27-Ts-Eiyv6_WRshOp7NV5OYUNbw2-kiN5Ll0k2UOA,839
 crypticorn_utils/router/admin_router.py,sha256=B8s0hqOFe6CFTTsCxtwMUZSdb5EbRsFeKPixH9CXwOU,4090
 crypticorn_utils/router/status_router.py,sha256=tqrTXq4ZWCxiTXinQoK-2tadWu2jUFzzzkN_Dft0P8g,1084
-crypticorn_utils-0.1.1rc1.dist-info/licenses/LICENSE,sha256=HonAVvzFXkP2C1d7D3ByIKPwjGH8NcHTAQvKH7uvOHQ,1856
-crypticorn_utils-0.1.1rc1.dist-info/METADATA,sha256=Wf5cqB8qnEnu20zpOqwcOt1nY4mYkLckFCwY3pb011w,4377
-crypticorn_utils-0.1.1rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-crypticorn_utils-0.1.1rc1.dist-info/entry_points.txt,sha256=G4yWDll7v_Kb4uemqI-_qTKXHvs10R4mD7hNuD-biv4,71
-crypticorn_utils-0.1.1rc1.dist-info/top_level.txt,sha256=jLPvdxnI36RPf8TX3aZhl35OSd721xEYyFSEeQKF6Ic,17
-crypticorn_utils-0.1.1rc1.dist-info/RECORD,,
+crypticorn_utils-0.1.2.dist-info/licenses/LICENSE,sha256=HonAVvzFXkP2C1d7D3ByIKPwjGH8NcHTAQvKH7uvOHQ,1856
+crypticorn_utils-0.1.2.dist-info/METADATA,sha256=A3c5MN2-lQh32s5Tsdv-oX3Xp5NxIQrXLndUExIr7dc,4933
+crypticorn_utils-0.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+crypticorn_utils-0.1.2.dist-info/entry_points.txt,sha256=G4yWDll7v_Kb4uemqI-_qTKXHvs10R4mD7hNuD-biv4,71
+crypticorn_utils-0.1.2.dist-info/top_level.txt,sha256=jLPvdxnI36RPf8TX3aZhl35OSd721xEYyFSEeQKF6Ic,17
+crypticorn_utils-0.1.2.dist-info/RECORD,,

crypticorn_utils/cli/__init__.py

@@ -1,4 +0,0 @@
-from crypticorn.cli.init import init_group
-from crypticorn.cli.version import version
-
-__all__ = ["init_group", "version"]

crypticorn_utils/cli/__main__.py

@@ -1,17 +0,0 @@
-# crypticorn/cli.py
-
-import click
-from crypticorn.cli import init_group, version
-
-
-@click.group()
-def cli():
-    """🧙 Crypticorn CLI — magic for our microservices."""
-    pass
-
-
-cli.add_command(init_group, name="init")
-cli.add_command(version, name="version")
-
-if __name__ == "__main__":
-    cli()

crypticorn_utils/cli/init.py

@@ -1,127 +0,0 @@
-import click
-from pathlib import Path
-import subprocess
-import importlib.resources
-import crypticorn.cli.templates as templates
-
-
-def get_git_root() -> Path:
-    """Get the root directory of the git repository."""
-    try:
-        return Path(
-            subprocess.check_output(
-                ["git", "rev-parse", "--show-toplevel"], text=True
-            ).strip()
-        )
-    except Exception:
-        return Path.cwd()
-
-
-def copy_template(template_name: str, target_path: Path):
-    """Copy a template file to the target path."""
-    with importlib.resources.files(templates).joinpath(template_name).open(
-        "r"
-    ) as template_file:
-        content = template_file.read()
-
-    target_path.parent.mkdir(parents=True, exist_ok=True)
-    with target_path.open("w") as f:
-        f.write(content)
-
-    click.secho(f"✅ Created: {target_path}", fg="green")
-
-
-def check_file_exists(path: Path, force: bool):
-    if path.exists() and not force:
-        click.secho("File already exists, use --force / -f to overwrite", fg="red")
-        return False
-    return True
-
-
-@click.group()
-def init_group():
-    """Initialize files like CI configs, linters, etc."""
-    pass
-
-
-@init_group.command("ruff")
-@click.option("-f", "--force", is_flag=True, help="Force overwrite the ruff.yml")
-def init_ruff(force):
-    """Add .github/workflows/ruff.yml"""
-    root = get_git_root()
-    target = root / ".github/workflows/ruff.yml"
-    if target.exists() and not force:
-        click.secho("File already exists, use --force / -f to overwrite", fg="red")
-        return
-    copy_template("ruff.yml", target)
-
-
-@init_group.command("docker")
-@click.option(
-    "-o", "--output", type=click.Path(), help="Custom output path for the Dockerfile"
-)
-@click.option("-f", "--force", is_flag=True, help="Force overwrite the Dockerfile")
-def init_docker(output, force):
-    """Add Dockerfile"""
-    root = get_git_root()
-    if output and Path(output).is_file():
-        click.secho("Output path is a file, please provide a directory path", fg="red")
-        return
-    target = (Path(output) if output else root) / "Dockerfile"
-    if not check_file_exists(target, force):
-        return
-    copy_template("Dockerfile", target)
-    click.secho("Make sure to update the Dockerfile", fg="yellow")
-
-
-@init_group.command("auth")
-@click.option(
-    "-o", "--output", type=click.Path(), help="Custom output path for the auth handler"
-)
-@click.option("-f", "--force", is_flag=True, help="Force overwrite the auth handler")
-def init_auth(output, force):
-    """Add auth.py with auth handler. Everything you need to start using the auth service."""
-    root = get_git_root()
-    if output and Path(output).is_file():
-        click.secho("Output path is a file, please provide a directory path", fg="red")
-        return
-    target = (Path(output) if output else root) / "auth.py"
-    if not check_file_exists(target, force):
-        return
-    copy_template("auth.py", target)
-    click.secho(
-        """
-    Make sure to update the .env and .env.example files with:
-        IS_DOCKER=0
-        API_ENV=local
-    and the docker-compose.yml file with:
-        environment:
-            - IS_DOCKER=1
-    and the .github/workflows/main.yaml file with:
-        env:
-            API_ENV: ${{ github.ref == 'refs/heads/main' && 'prod' || 'dev' }}
-    """,
-        fg="yellow",
-    )
-
-
-@init_group.command("dependabot")
-@click.option("-f", "--force", is_flag=True, help="Force overwrite the dependabot.yml")
-def init_dependabot(force):
-    """Add dependabot.yml"""
-    root = get_git_root()
-    target = root / ".github/dependabot.yml"
-    if not check_file_exists(target, force):
-        return
-    copy_template("dependabot.yml", target)
-
-
-@init_group.command("merge-env")
-@click.option("-f", "--force", is_flag=True, help="Force overwrite the .env file")
-def init_merge_env(force):
-    """Add script to merge environment and file variables into .env"""
-    root = get_git_root()
-    target = root / "scripts/merge-env.sh"
-    if not check_file_exists(target, force):
-        return
-    copy_template("merge-env.sh", target)

crypticorn_utils/cli/templates/auth.py

@@ -1,33 +0,0 @@
-from crypticorn.common import (
-    AuthHandler as AuthHandler,
-    Scope as Scope,
-    Verify200Response as Verify200Response,
-    BaseUrl as BaseUrl,
-    ApiEnv as ApiEnv,
-)
-from fastapi import Security as Security
-import os
-import dotenv
-import logging
-
-dotenv.load_dotenv()
-
-logger = logging.getLogger(__name__)
-
-DOCKER_ENV = os.getenv("IS_DOCKER", "0")
-API_ENV = os.getenv("API_ENV")
-
-if not API_ENV:
-    raise ValueError(
-        "API_ENV is not set. Please set it to 'prod', 'dev' or 'local' in .env (of type ApiEnv)."
-    )
-
-if DOCKER_ENV == "0":
-    logger.info(f"Using {API_ENV} environment")
-    base_url = BaseUrl.from_env(ApiEnv(API_ENV))
-else:
-    base_url = BaseUrl.DOCKER
-    logger.info("Using docker environment")
-
-auth_handler = AuthHandler(base_url=base_url)
-logger.info(f"Auth URL: {auth_handler.client.config.host}")

crypticorn_utils/cli/version.py

@@ -1,8 +0,0 @@
-import importlib.metadata
-import click
-
-
-@click.command("version")
-def version():
-    """Print the version of the crypticorn package"""
-    click.echo(importlib.metadata.distribution("crypticorn").version)