crypticorn-utils 0.1.1rc1__tar.gz → 0.1.2__tar.gz

crypticorn_utils-0.1.2/MANIFEST.in

@@ -0,0 +1,2 @@
+include README.md
+include LICENSE

{crypticorn_utils-0.1.1rc1/crypticorn_utils.egg-info → crypticorn_utils-0.1.2}/PKG-INFO

@@ -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 → crypticorn_utils-0.1.2}/README.md

@@ -21,6 +21,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 → crypticorn_utils-0.1.2}/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-0.1.1rc1 → crypticorn_utils-0.1.2}/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 → crypticorn_utils-0.1.2/crypticorn_utils.egg-info}/PKG-INFO

@@ -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 → crypticorn_utils-0.1.2}/crypticorn_utils.egg-info/SOURCES.txt

@@ -24,12 +24,6 @@ crypticorn_utils.egg-info/dependency_links.txt
 crypticorn_utils.egg-info/entry_points.txt
 crypticorn_utils.egg-info/requires.txt
 crypticorn_utils.egg-info/top_level.txt
-crypticorn_utils/cli/__init__.py
-crypticorn_utils/cli/__main__.py
-crypticorn_utils/cli/init.py
-crypticorn_utils/cli/version.py
-crypticorn_utils/cli/templates/__init__.py
-crypticorn_utils/cli/templates/auth.py
 crypticorn_utils/router/admin_router.py
 crypticorn_utils/router/status_router.py
 requirements/dev.txt

{crypticorn_utils-0.1.1rc1 → crypticorn_utils-0.1.2}/crypticorn_utils.egg-info/requires.txt

@@ -4,6 +4,7 @@ psutil<8.0.0,>=7.0.0
 setuptools<81.0.0,>=80.0.0
 strenum
 prometheus-client<1.0.0,>=0.22.0
+crypticorn<3.0.0,>=2.17.0
 
 [dev]
 build
@@ -22,4 +23,3 @@ pytest-cov==6.1.1
 python-dotenv==1.0.1
 PyJWT==2.10.0
 httpx>=0.27.0
-crypticorn>=2.17.0

{crypticorn_utils-0.1.1rc1 → crypticorn_utils-0.1.2}/pyproject.toml

@@ -5,7 +5,7 @@ readme = "README.md"
 license = "MIT"
 requires-python = ">=3.9"
 authors = [{name = "Crypticorn", email = "timon@crypticorn.com"}]
-version = "0.1.1-rc.1"
+version = "0.1.2"
 dynamic = ["dependencies", "optional-dependencies"]
 
 classifiers = [

{crypticorn_utils-0.1.1rc1 → crypticorn_utils-0.1.2}/requirements/main.txt

@@ -4,4 +4,4 @@ psutil >= 7.0.0, < 8.0.0
 setuptools >= 80.0.0, < 81.0.0
 strenum # drop this once we drop python 3.10, StrEnum is available in stdlib (enum) in 3.11+
 prometheus-client >= 0.22.0, < 1.0.0
-
+crypticorn>=2.17.0, < 3.0.0

{crypticorn_utils-0.1.1rc1 → crypticorn_utils-0.1.2}/requirements/test.txt

@@ -4,4 +4,3 @@ pytest-cov==6.1.1
 python-dotenv==1.0.1
 PyJWT==2.10.0
 httpx>=0.27.0
-crypticorn>=2.17.0

{crypticorn_utils-0.1.1rc1 → crypticorn_utils-0.1.2}/tests/test_auth_client.py

@@ -207,7 +207,7 @@ async def test_combined_auth_with_valid_prediction_bearer_token(
         api_key=None,
     )
     assert all(
-        [key in res.scopes for key in PURCHASEABLE_SCOPES]
+        [key in res.scopes for key in ['read:predictions']]
     ), "non admin which purchased predictions should have access to purchaseable scopes"
     assert all(
         [key not in res.scopes for key in ADMIN_SCOPES]

crypticorn_utils-0.1.1rc1/MANIFEST.in

@@ -1,3 +0,0 @@
-graft crypticorn/cli/templates
-include README.md
-include LICENSE

crypticorn_utils-0.1.1rc1/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-0.1.1rc1/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-0.1.1rc1/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-0.1.1rc1/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-0.1.1rc1/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)