axis-synome 0.1.0.dev72__tar.gz → 0.1.0.dev74__tar.gz

{axis_synome-0.1.0.dev72/src/axis_synome.egg-info → axis_synome-0.1.0.dev74}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: axis-synome
-Version: 0.1.0.dev72
+Version: 0.1.0.dev74
 Summary: Axis specification modules (entities, formulas, validators)
 Author-email: Archon Tech <hello@archontech.ai>
 License: MIT

{axis_synome-0.1.0.dev72 → axis_synome-0.1.0.dev74}/src/axis_synome/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.1.0.dev72'
-__version_tuple__ = version_tuple = (0, 1, 0, 'dev72')
+__version__ = version = '0.1.0.dev74'
+__version_tuple__ = version_tuple = (0, 1, 0, 'dev74')
 
 __commit_id__ = commit_id = None

{axis_synome-0.1.0.dev72 → axis_synome-0.1.0.dev74}/src/axis_synome/export_entities.py

@@ -162,7 +162,34 @@ def _version_from_package_metadata() -> str:
 
 
 def _axis_synome_git_commit() -> str:
-    repo_root = Path(__file__).resolve().parents[2]
+    """Resolve the axis-synome commit for the exported contract's provenance.
+
+    Prefer the commit baked into ``_version.py`` at build time. Otherwise fall
+    back to ``git rev-parse`` only when running from the axis-synome source tree.
+    An installed wheel lives under ``site-packages`` (often nested inside a
+    consumer's git repository), and walking up from there would resolve that
+    consumer's HEAD, which is not our commit; return ``"unknown"`` instead.
+    """
+    embedded = _build_embedded_commit()
+    if embedded:
+        return embedded
+    return _git_commit_from_checkout(Path(__file__).resolve().parents[2])
+
+
+def _build_embedded_commit() -> str | None:
+    try:
+        from axis_synome._version import commit_id
+    except ImportError:
+        return None
+    return commit_id
+
+
+def _git_commit_from_checkout(repo_root: Path) -> str:
+    # Only trust git inside the axis-synome source tree. When installed as a
+    # wheel, repo_root points into site-packages, so a surrounding consumer
+    # repository's HEAD must never be mistaken for our commit.
+    if not (repo_root / "src" / "axis_synome").is_dir():
+        return "unknown"
     try:
         return subprocess.check_output(
             ["git", "rev-parse", "HEAD"], cwd=repo_root, text=True
@@ -353,7 +380,12 @@ def export_axis_synome_contract(
 
     data_path.write_text(config.model_dump_json(indent=2, by_alias=True), encoding="utf-8")
 
-    schema = AxisSynomeContract.model_json_schema(by_alias=True)
+    # Generate the schema in serialization mode so its property names use the
+    # serialization aliases (ASSETS_BY_PRIME, AlmProxy) that the emitted data
+    # actually uses. With the default (validation) mode the schema would use the
+    # Python field names (entries, proxies) and the data would fail to validate
+    # against its own schema.
+    schema = AxisSynomeContract.model_json_schema(by_alias=True, mode="serialization")
     schema_path.write_text(json.dumps(schema, indent=2), encoding="utf-8")
 
 

{axis_synome-0.1.0.dev72 → axis_synome-0.1.0.dev74}/src/axis_synome/spec/asc/entities/assets_by_prime.py

@@ -61,14 +61,15 @@ GROVE_MONAD_UNISWAP_AUSD_USDC: Final[Asset] = Asset(
     address=EvmAddress("0x6B405DCA74897c9442d369DcF6c0EC230f7E1c7C"),
     source="A.6.1.1.2.2.6.1.3.1.12.1.2.2.1",
     underlying_asset=Token.USDC,
-    underlying_asset_address=EvmAddress("0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"),
+    underlying_asset_address=EvmAddress("0x754704Bc059F8C67012fEd69BC8A327a5aafb603"),
     underlying_asset_source="A.6.1.1.2.2.6.1.3.1.12.1.2.2.2",
     categories={AssetCategory.CASH_STABLECOIN},
 )
-"""Monad Uniswap AUSD/USDC pool. The Atlas Underlying Asset Address node records
-USDC (0xA0b8…), which is the asset supplied by the Grove Liquidity Layer; the
-token name carries no "LP" marker so the export derives token_type
-"uni_v3_pool"."""
+"""Monad Uniswap AUSD/USDC pool. The pool and its tokens live on Monad, so the
+Atlas Underlying Asset Address node records the Monad-native USDC
+(0x754704Bc…), not mainnet USDC; a consumer reading the underlying on Monad
+needs the chain-local token. The token name carries no "LP" marker so the
+export derives token_type "uni_v3_pool"."""
 
 
 ASSETS_BY_PRIME: dict[PrimeName, list[Asset]] = {
@@ -391,10 +392,10 @@ ASSETS_BY_PRIME: dict[PrimeName, list[Asset]] = {
             token=Token.A_BAS_USDC,
             network=Network.BASE,
             protocol=Protocol.AAVE,
-            address=EvmAddress("0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"),
+            address=EvmAddress("0x4e65fE4DbA92790696d040ac24Aa414708F5c0AB"),
             source="A.6.1.1.1.2.6.1.3.2.3.1.2.2.1",
             underlying_asset=Token.USDC,
-            underlying_asset_address=EvmAddress("0x4e65fE4DbA92790696d040ac24Aa414708F5c0AB"),
+            underlying_asset_address=EvmAddress("0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"),
             underlying_asset_source="A.6.1.1.1.2.6.1.3.2.3.1.2.2.2",
             categories={AssetCategory.LENDING_MARKET},
         ),

{axis_synome-0.1.0.dev72 → axis_synome-0.1.0.dev74}/src/axis_synome/spec/asc/entities/assets_missing_from_atlas.py

@@ -347,20 +347,6 @@ SPARK_MAINNET_RISK_CAPITAL_USDS: Final[MissingAtlasAsset] = MissingAtlasAsset(
 Atlas A.6.1.1.1.2.6.1.2.1.1.1.3.1.1.2."""
 
 
-SPARK_BASE_AAVE_ATOKEN: Final[MissingAtlasAsset] = MissingAtlasAsset(
-    network=Network.BASE,
-    address=EvmAddress("0x4e65fE4DbA92790696d040ac24Aa414708F5c0AB"),
-    protocol=Protocol.AAVE,
-    allocation_type=AllocationType.ALLOCATION,
-    token_type=TokenType.ATOKEN,
-    underlying_asset_address=EvmAddress("0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"),
-)
-"""Base Aave aToken ("skip — existing worker"). NB: the Atlas-backed A_BAS_USDC
-entry in assets_by_prime currently uses 0x833589… (the USDC underlying) as its
-contract address; per entries.go that address is an idle asset and this
-0x4e65fE4D… is the aTokens — flagged for reviewers."""
-
-
 SPARK_BASE_POL_PROXY: Final[MissingAtlasAsset] = MissingAtlasAsset(
     network=Network.BASE,
     address=EvmAddress("0x5875eEE11Cf8398102FdAd704C9E96607675467a"),
@@ -544,7 +530,6 @@ MISSING_FROM_ATLAS_BY_PRIME: Final[dict[PrimeName, list[MissingAtlasAsset]]] = {
         SPARK_MAINNET_POL_USDS,
         SPARK_MAINNET_ASSET_PYUSD,
         SPARK_MAINNET_RISK_CAPITAL_USDS,
-        SPARK_BASE_AAVE_ATOKEN,
         SPARK_BASE_POL_PROXY,
         SPARK_ARBITRUM_POL_PROXY,
         SPARK_ARBITRUM_ASSET_USDC,

{axis_synome-0.1.0.dev72 → axis_synome-0.1.0.dev74/src/axis_synome.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: axis-synome
-Version: 0.1.0.dev72
+Version: 0.1.0.dev74
 Summary: Axis specification modules (entities, formulas, validators)
 Author-email: Archon Tech <hello@archontech.ai>
 License: MIT

{axis_synome-0.1.0.dev72 → axis_synome-0.1.0.dev74}/tests/axis_synome/scripts/test_export_entities.py

@@ -2,8 +2,15 @@ import json
 import subprocess
 import sys
 from pathlib import Path
-
-from axis_synome.export_entities import _prime_to_star, build_axis_synome_contract
+from typing import cast
+
+from axis_synome import export_entities
+from axis_synome.export_entities import (
+    _axis_synome_git_commit,
+    _git_commit_from_checkout,
+    _prime_to_star,
+    build_axis_synome_contract,
+)
 from axis_synome.spec.asc.entities.assets_by_prime import ASSETS_BY_PRIME, PrimeName
 from axis_synome.spec.asc.entities.assets_missing_from_atlas import (
     MISSING_FROM_ATLAS_BY_PRIME,
@@ -62,6 +69,41 @@ def test_export_entities_outputs_contract_and_schema(tmp_path: Path):
     assert schema["title"] == "AxisSynomeContract"
 
 
+def test_schema_property_names_match_emitted_data(tmp_path: Path):
+    """The exported schema must describe the keys the data actually uses
+    (ASSETS_BY_PRIME, AlmProxy), not the Python field names. Guards against
+    generating the schema in validation mode, which emits `entries`/`proxies`
+    and makes the contract fail to validate against its own schema."""
+    repo_root = Path(__file__).resolve().parents[4]
+    out_path = tmp_path / "axis_synome_entities.json"
+    schema_path = tmp_path / "axis_synome_entities.schema.json"
+    _run_export(repo_root, out_path, schema_path)
+
+    schema = json.loads(schema_path.read_text(encoding="utf-8"))
+
+    # Collect every property name declared anywhere in the schema (incl. $defs).
+    prop_names: set[str] = set()
+
+    def walk(node: object) -> None:
+        if isinstance(node, dict):
+            mapping = cast(dict[str, object], node)
+            props = mapping.get("properties")
+            if isinstance(props, dict):
+                prop_names.update(cast(dict[str, object], props).keys())
+            for value in mapping.values():
+                walk(value)
+        elif isinstance(node, list):
+            for value in cast(list[object], node):
+                walk(value)
+
+    walk(schema)
+
+    assert "ASSETS_BY_PRIME" in prop_names
+    assert "AlmProxy" in prop_names
+    assert "entries" not in prop_names
+    assert "proxies" not in prop_names
+
+
 def test_export_keeps_alm_proxy_and_additional_proxies():
     """Both the canonical ALM Proxy and the SubProxy must be exported per
     (star, chain); the SubProxy must not replace the ALM Proxy."""
@@ -196,3 +238,22 @@ def test_prime_to_star_round_trips_known_primes():
     """Sanity: the prime->star slug used to key the export is stable."""
     assert _prime_to_star(PrimeName.SPARK) == "spark"
     assert _prime_to_star(PrimeName.GROVE) == "grove"
+
+
+def test_git_commit_from_checkout_ignores_foreign_repo(tmp_path):
+    """A repo_root without src/axis_synome (e.g. an installed wheel nested in a
+    consumer repo) must not shell out to git and report that repo's HEAD."""
+    assert _git_commit_from_checkout(tmp_path) == "unknown"
+
+
+def test_git_commit_prefers_build_embedded(monkeypatch):
+    """When _version.py carries a build-time commit, it wins over any git probe."""
+    monkeypatch.setattr(export_entities, "_build_embedded_commit", lambda: "abc123")
+    assert _axis_synome_git_commit() == "abc123"
+
+
+def test_git_commit_unknown_when_unembedded_and_not_in_checkout(monkeypatch):
+    """No embedded commit and not in the source tree resolves to "unknown"."""
+    monkeypatch.setattr(export_entities, "_build_embedded_commit", lambda: None)
+    monkeypatch.setattr(export_entities, "_git_commit_from_checkout", lambda _root: "unknown")
+    assert _axis_synome_git_commit() == "unknown"