proof-of-portfolio 0.0.47__tar.gz → 0.0.48__tar.gz

{proof_of_portfolio-0.0.47 → proof_of_portfolio-0.0.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proof-of-portfolio
-Version: 0.0.47
+Version: 0.0.48
 Summary: Zero-Knowledge Proof framework for verifiable, private portfolio performance metrics
 Author-email: "Inference Labs, Inc." <info@inferencelabs.com>
 Requires-Python: >=3.10
@@ -10,6 +10,7 @@ Requires-Dist: colorama
 Requires-Dist: matplotlib
 Requires-Dist: toml
 Requires-Dist: scipy
+Requires-Dist: bittensor
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: flake8; extra == "dev"

{proof_of_portfolio-0.0.47 → proof_of_portfolio-0.0.48}/proof_of_portfolio/_version.py

@@ -1,2 +1,2 @@
 # This file is auto-generated during build
-__version__ = "0.0.47"
+__version__ = "0.0.48"

{proof_of_portfolio-0.0.47 → proof_of_portfolio-0.0.48}/proof_of_portfolio/demos/calmar.py

@@ -4,6 +4,7 @@ import subprocess
 import os
 import time
 from . import utils
+from ..parsing_utils import parse_demo_output
 
 SCALE = 10_000_000
 WEIGHTED_AVERAGE_DECAY_RATE = 0.08
@@ -127,21 +128,12 @@ def run_calmar_nargo(
             f"DEBUG: Prover.toml after nargo execute - first line of log_returns: {content.split('log_returns = [')[1].split(',')[0] if 'log_returns = [' in content else 'NOT_FOUND'}"
         )
 
-    fp = 0
-    if "Field" in result.stdout:
-        unsigned_i = int(result.stdout.split("Field(")[1].split(")")[0])
-        if unsigned_i >= 2**63:
-            i = unsigned_i - 2**64
-        else:
-            i = unsigned_i
-        if i == CALMAR_NOCONFIDENCE_VALUE:
-            fp = float(i)
-        else:
-            fp = i / SCALE
     if result.returncode != 0:
         print(result.stderr)
         raise RuntimeError("nargo execute failed")
 
+    fp = parse_demo_output(result.stdout, SCALE, CALMAR_NOCONFIDENCE_VALUE)
+
     # Debug: Final check of Prover.toml at end of function
     with open(prover_path, "r") as f:
         content = f.read()

{proof_of_portfolio-0.0.47 → proof_of_portfolio-0.0.48}/proof_of_portfolio/demos/omega.py

@@ -3,6 +3,7 @@ import matplotlib.pyplot as plt
 import numpy as np
 import subprocess
 from . import utils
+from ..parsing_utils import parse_demo_output
 
 SCALE = 10_000_000
 WEIGHTED_AVERAGE_DECAY_RATE = 0.08
@@ -114,21 +115,12 @@ def run_omega_nargo(log_returns: list[float], bypass_confidence: bool, weighting
         text=True,
         cwd=prover_path.rsplit("/", 1)[0],
     )
-    fp = 0
-    if "Field" in result.stdout:
-        unsigned_i = int(result.stdout.split("Field(")[1].split(")")[0])
-        if unsigned_i >= 2**63:
-            i = unsigned_i - 2**64
-        else:
-            i = unsigned_i
-        if i == OMEGA_NOCONFIDENCE_VALUE:
-            fp = float(i)
-        else:
-            fp = i / SCALE
+
     if result.returncode != 0:
         print(result.stderr)
         raise RuntimeError("nargo execute failed")
-    return fp
+
+    return parse_demo_output(result.stdout, SCALE, OMEGA_NOCONFIDENCE_VALUE)
 
 
 def compare_implementations(test_data: dict, bypass_confidence: bool, weighting: bool):

{proof_of_portfolio-0.0.47 → proof_of_portfolio-0.0.48}/proof_of_portfolio/demos/sharpe.py

@@ -4,6 +4,7 @@ import numpy as np
 import math
 import subprocess
 from . import utils
+from ..parsing_utils import parse_demo_output
 
 SCALE = 10_000_000
 WEIGHTED_AVERAGE_DECAY_RATE = 0.08
@@ -126,21 +127,12 @@ def run_sharpe_nargo(
         text=True,
         cwd=prover_path.rsplit("/", 1)[0],
     )
-    fp = 0
-    if "Field" in result.stdout:
-        unsigned_i = int(result.stdout.split("Field(")[1].split(")")[0])
-        if unsigned_i >= 2**63:
-            i = unsigned_i - 2**64
-        else:
-            i = unsigned_i
-        if i == SHARPE_NOCONFIDENCE_VALUE:
-            fp = float(i)
-        else:
-            fp = i / SCALE
+
     if result.returncode != 0:
         print(result.stderr)
         raise RuntimeError("nargo execute failed")
-    return fp
+
+    return parse_demo_output(result.stdout, SCALE, SHARPE_NOCONFIDENCE_VALUE)
 
 
 def compare_implementations(test_data: dict, bypass_confidence: bool, weighting: bool):

{proof_of_portfolio-0.0.47 → proof_of_portfolio-0.0.48}/proof_of_portfolio/demos/sortino.py

@@ -4,6 +4,7 @@ import numpy as np
 import math
 import subprocess
 from . import utils
+from ..parsing_utils import parse_demo_output
 
 SCALE = 10_000_000
 WEIGHTED_AVERAGE_DECAY_RATE = 0.08
@@ -140,21 +141,11 @@ def run_sortino_nargo(
         text=True,
         cwd=prover_path.rsplit("/", 1)[0],
     )
-    fp = 0
-    if "Field" in result.stdout:
-        unsigned_i = int(result.stdout.split("Field(")[1].split(")")[0])
-        if unsigned_i >= 2**63:
-            i = unsigned_i - 2**64
-        else:
-            i = unsigned_i
-        if i == SORTINO_NOCONFIDENCE_VALUE:
-            fp = float(i)
-        else:
-            fp = i / SCALE
     if result.returncode != 0:
         print(result.stderr)
         raise RuntimeError("nargo execute failed")
-    return fp
+
+    return parse_demo_output(result.stdout, SCALE, SORTINO_NOCONFIDENCE_VALUE)
 
 
 def compare_implementations(test_data: dict, bypass_confidence: bool, weighting: bool):

{proof_of_portfolio-0.0.47 → proof_of_portfolio-0.0.48}/proof_of_portfolio/demos/tstat.py

@@ -3,6 +3,7 @@ import numpy as np
 import subprocess
 from scipy.stats import ttest_1samp
 from . import utils
+from ..parsing_utils import parse_demo_output
 
 SCALE = 10_000_000
 WEIGHTED_AVERAGE_DECAY_RATE = 0.08
@@ -59,21 +60,13 @@ def run_tstat_nargo(log_returns: list[float], bypass_confidence: bool, weighting
         text=True,
         cwd=prover_path.rsplit("/", 1)[0],
     )
-    fp = 0
-    if "Field" in result.stdout:
-        unsigned_i = int(result.stdout.split("Field(")[1].split(")")[0])
-        if unsigned_i >= 2**63:
-            i = unsigned_i - 2**64
-        else:
-            i = unsigned_i
-        if i == STATISTICAL_CONFIDENCE_NOCONFIDENCE_VALUE:
-            fp = float(i)
-        else:
-            fp = i / SCALE
     if result.returncode != 0:
         print(result.stderr)
         raise RuntimeError("nargo execute failed")
-    return fp
+
+    return parse_demo_output(
+        result.stdout, SCALE, STATISTICAL_CONFIDENCE_NOCONFIDENCE_VALUE
+    )
 
 
 def compare_implementations(test_data: dict, bypass_confidence: bool, weighting: bool):

proof_of_portfolio-0.0.48/proof_of_portfolio/parsing_utils.py

@@ -0,0 +1,201 @@
+"""
+Shared parsing utilities for nargo output across all demos.
+"""
+
+import re
+
+
+def parse_single_field_output(output):
+    """
+    Parses nargo output that contains a single field value.
+    Returns the integer value, or None if no field found.
+    """
+    if "0x" in output:
+        hex_match = output.split("0x")[1].split()[0]
+        return int(hex_match, 16)
+
+    if "Field(" in output:
+        return int(output.split("Field(")[1].split(")")[0])
+
+    if "Circuit output:" in output:
+        output_line = output.split("Circuit output:")[1].strip().split()[0]
+        return int(output_line)
+
+    lines = output.strip().split("\n")
+    for line in lines:
+        line = line.strip()
+        if (
+            line
+            and not any(char.isalpha() for char in line)
+            and line.replace("-", "").replace(".", "").isdigit()
+        ):
+            return int(float(line))
+
+    return None
+
+
+def field_to_signed_int(field_str):
+    """
+    Convert a field string to a signed integer, handling two's complement.
+    """
+    if isinstance(field_str, str) and field_str.startswith("0x"):
+        val = int(field_str, 16)
+    else:
+        val = int(field_str)
+
+    # Noir's i64 as u64 casting uses standard two's complement
+    # Convert from u64 back to i64 using two's complement
+    if val >= 2**63:  # If the high bit is set, it's negative
+        return val - 2**64  # Convert from unsigned to signed
+    else:
+        return val  # Positive values unchanged
+
+
+def parse_demo_output(output, scale=10_000_000, no_confidence_value=-100):
+    """
+    Standardized parsing for demo output.
+
+    Args:
+        output: Raw stdout
+        scale: Scale factor used in the circuit (default 10M)
+        no_confidence_value: Value indicating no confidence result
+
+    Returns:
+        Float value scaled appropriately, or the no_confidence_value as-is
+    """
+    field_value = parse_single_field_output(output)
+
+    if field_value is None:
+        raise ValueError(f"Could not parse field value from nargo output: {output}")
+
+    signed_value = field_to_signed_int(field_value)
+
+    # If it's the no confidence marker, return as-is
+    if signed_value == no_confidence_value:
+        return float(signed_value)
+
+    # Otherwise scale it back
+    return signed_value / scale
+
+
+def parse_nargo_struct_output(output):
+    """
+    Parses the raw output of a nargo execute command that returns a struct.
+    """
+    if (
+        "[" in output
+        and "]" in output
+        and not ("MerkleTree" in output or "ReturnsData" in output)
+    ):
+        array_matches = re.findall(r"\[([^\]]+)\]", output)
+        if array_matches:
+            array_content = array_matches[-1]
+            values = []
+            for item in array_content.split(","):
+                item = item.strip()
+                if item.startswith("0x"):
+                    try:
+                        values.append(str(int(item, 16)))
+                    except ValueError:
+                        continue
+                elif item.lstrip("-").isdigit():
+                    values.append(item)
+            if values:
+                return values
+
+    struct_start = output.find("{")
+    struct_end = output.rfind("}")
+
+    if struct_start == -1 or struct_end == -1:
+        return re.findall(r"Field\(([-0-9]+)\)", output)
+
+    struct_content = output[struct_start : struct_end + 1]
+
+    if "MerkleTree" in output:
+        tree = {}
+        try:
+            if "leaf_hashes:" in struct_content:
+                start = struct_content.find("leaf_hashes:") + len("leaf_hashes:")
+                end = struct_content.find(", path_elements:")
+                leaf_section = struct_content[start:end].strip()
+                if leaf_section.startswith("[") and leaf_section.endswith("]"):
+                    leaf_content = leaf_section[1:-1]
+                    tree["leaf_hashes"] = [
+                        x.strip() for x in leaf_content.split(",") if x.strip()
+                    ]
+
+            # Parse path_elements
+            if "path_elements:" in struct_content:
+                start = struct_content.find("path_elements:") + len("path_elements:")
+                end = struct_content.find(", path_indices:")
+                path_elem_section = struct_content[start:end].strip()
+                tree["path_elements"] = parse_nested_arrays(path_elem_section)
+
+            # Parse path_indices
+            if "path_indices:" in struct_content:
+                start = struct_content.find("path_indices:") + len("path_indices:")
+                end = struct_content.find(", root:")
+                path_idx_section = struct_content[start:end].strip()
+                tree["path_indices"] = parse_nested_arrays(path_idx_section)
+
+            # Parse root
+            if "root:" in struct_content:
+                start = struct_content.find("root:") + len("root:")
+                root_section = struct_content[start:].strip().rstrip("}")
+                tree["root"] = root_section.strip()
+
+            return tree
+        except Exception:
+            pass
+
+    values = []
+
+    parts = re.split(r"[,\s]+", struct_content)
+    for part in parts:
+        part = part.strip("{}[](), \t\n\r")
+        if not part:
+            continue
+
+        if part.startswith("0x") and len(part) > 2:
+            try:
+                values.append(str(int(part, 16)))
+                continue
+            except ValueError:
+                pass
+
+        if part.lstrip("-").isdigit():
+            values.append(part)
+
+    return values
+
+
+def parse_nested_arrays(section):
+    """Helper function to parse nested array structures like [[...], [...]]"""
+    if not section.strip().startswith("["):
+        return []
+
+    arrays = []
+    depth = 0
+    current_array = ""
+
+    for char in section:
+        if char == "[":
+            depth += 1
+            if depth == 2:  # Start of inner array
+                current_array = ""
+            elif depth == 1:  # Start of outer array
+                continue
+        elif char == "]":
+            depth -= 1
+            if depth == 1:  # End of inner array
+                if current_array.strip():
+                    arrays.append(
+                        [x.strip() for x in current_array.split(",") if x.strip()]
+                    )
+                current_array = ""
+            elif depth == 0:  # End of outer array
+                break
+        elif depth == 2:  # Inside inner array
+            current_array += char
+
+    return arrays

{proof_of_portfolio-0.0.47 → proof_of_portfolio-0.0.48}/proof_of_portfolio/proof_generator.py

@@ -5,6 +5,7 @@ import os
 import time
 from .min_metrics import MinMetrics
 import math
+import bittensor as bt
 
 # Constants for the circuit
 MAX_CHECKPOINTS = 200
@@ -19,16 +20,16 @@ def run_command(command, cwd, verbose=True):
     """Executes a command in a given directory and returns the output."""
     result = subprocess.run(command, capture_output=True, text=True, cwd=cwd)
     if verbose:
-        print("--- nargo stdout ---")
-        print(result.stdout)
-        print("--- nargo stderr ---")
-        print(result.stderr)
-        print("--------------------")
+        bt.logging.info("--- nargo stdout ---")
+        bt.logging.info(result.stdout)
+        bt.logging.info("--- nargo stderr ---")
+        bt.logging.info(result.stderr)
+        bt.logging.info("--------------------")
     if result.returncode != 0:
         if verbose:
-            print("Error:")
-            print(result.stdout)
-            print(result.stderr)
+            bt.logging.error("Error:")
+            bt.logging.error(result.stdout)
+            bt.logging.error(result.stderr)
         raise RuntimeError(
             f"Command {' '.join(command)} failed with exit code {result.returncode}"
         )
@@ -265,25 +266,39 @@ def generate_proof(data=None, miner_hotkey=None, verbose=None):
     Returns:
         Dictionary with proof results including status, portfolio_metrics, etc.
     """
+    bt.logging.info(
+        f"generate_proof called with verbose={verbose}, miner_hotkey={miner_hotkey[:8] if miner_hotkey else None}"
+    )
+
     # Auto-detect mode: demo mode if reading from file, production if data provided
     is_demo_mode = data is None
     if verbose is None:
         verbose = is_demo_mode
 
-    if data is None:
-        if verbose:
-            print("Loading data from validator_checkpoint.json...")
+    bt.logging.info(
+        f"After auto-detect: verbose={verbose}, is_demo_mode={is_demo_mode}"
+    )
+
+    try:
+        if data is None:
+            if verbose:
+                bt.logging.info("Loading data from validator_checkpoint.json...")
         import json
 
         with open("validator_checkpoint.json", "r") as f:
             data = json.load(f)
+    except Exception as e:
+        bt.logging.error(f"Failed to load data {e}")
 
     if miner_hotkey is None:
         miner_hotkey = list(data["perf_ledgers"].keys())[0]
         if verbose:
-            print(f"No hotkey specified, using first available: {miner_hotkey}")
+            bt.logging.info(
+                f"No hotkey specified, using first available: {miner_hotkey}"
+            )
     else:
-        print(f"Using specified hotkey: {miner_hotkey}")
+        if verbose:
+            bt.logging.info(f"Using specified hotkey: {miner_hotkey}")
 
     if miner_hotkey not in data["perf_ledgers"]:
         raise ValueError(
@@ -293,13 +308,13 @@ def generate_proof(data=None, miner_hotkey=None, verbose=None):
     perf_ledger = data["perf_ledgers"][miner_hotkey]
     positions = data["positions"][miner_hotkey]["positions"]
     if verbose:
-        print("Preparing circuit inputs...")
+        bt.logging.info("Preparing circuit inputs...")
 
     cps = perf_ledger["cps"]
     checkpoint_count = len(cps)
     if checkpoint_count > MAX_CHECKPOINTS:
         if verbose:
-            print(
+            bt.logging.warning(
                 f"Warning: Miner has {checkpoint_count} checkpoints, but circuit only supports {MAX_CHECKPOINTS}. Truncating."
             )
         cps = cps[:MAX_CHECKPOINTS]
@@ -324,7 +339,7 @@ def generate_proof(data=None, miner_hotkey=None, verbose=None):
     signals_count = len(all_orders)
     if signals_count > MAX_SIGNALS:
         if verbose:
-            print(
+            bt.logging.warning(
                 f"Warning: Miner has {signals_count} signals, but circuit only supports {MAX_SIGNALS}. Truncating."
             )
         all_orders = all_orders[:MAX_SIGNALS]
@@ -376,12 +391,14 @@ def generate_proof(data=None, miner_hotkey=None, verbose=None):
     ] * (MAX_SIGNALS - len(signals))
 
     if verbose:
-        print(f"Prepared {checkpoint_count} checkpoints and {signals_count} signals.")
+        bt.logging.info(
+            f"Prepared {checkpoint_count} checkpoints and {signals_count} signals."
+        )
 
     if verbose:
-        print("Running tree_generator circuit...")
+        bt.logging.info("Running tree_generator circuit...")
     else:
-        print(f"Generating tree for hotkey {miner_hotkey}...")
+        bt.logging.info(f"Generating tree for hotkey {miner_hotkey}...")
     current_dir = os.path.dirname(os.path.abspath(__file__))
     tree_generator_dir = os.path.join(current_dir, "tree_generator")
 
@@ -574,7 +591,6 @@ def generate_proof(data=None, miner_hotkey=None, verbose=None):
 
     # Calculate MinMetrics (Python) for comparison with ZK circuit
     try:
-
         # Extract daily log returns from checkpoint data (same as ZK circuit)
         daily_log_returns = []
         for cp in cps:

{proof_of_portfolio-0.0.47 → proof_of_portfolio-0.0.48}/proof_of_portfolio.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proof-of-portfolio
-Version: 0.0.47
+Version: 0.0.48
 Summary: Zero-Knowledge Proof framework for verifiable, private portfolio performance metrics
 Author-email: "Inference Labs, Inc." <info@inferencelabs.com>
 Requires-Python: >=3.10
@@ -10,6 +10,7 @@ Requires-Dist: colorama
 Requires-Dist: matplotlib
 Requires-Dist: toml
 Requires-Dist: scipy
+Requires-Dist: bittensor
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: flake8; extra == "dev"

{proof_of_portfolio-0.0.47 → proof_of_portfolio-0.0.48}/proof_of_portfolio.egg-info/SOURCES.txt

@@ -1,6 +1,5 @@
 README.md
 pyproject.toml
-setup.cfg
 setup.py
 proof_of_portfolio/__init__.py
 proof_of_portfolio/_version.py
@@ -8,6 +7,7 @@ proof_of_portfolio/analyze_data.py
 proof_of_portfolio/main.py
 proof_of_portfolio/min_metrics.py
 proof_of_portfolio/miner.py
+proof_of_portfolio/parsing_utils.py
 proof_of_portfolio/post_install.py
 proof_of_portfolio/proof_generator.py
 proof_of_portfolio/signal_processor.py

{proof_of_portfolio-0.0.47 → proof_of_portfolio-0.0.48}/proof_of_portfolio.egg-info/requires.txt

@@ -3,6 +3,7 @@ colorama
 matplotlib
 toml
 scipy
+bittensor
 
 [dev]
 black

{proof_of_portfolio-0.0.47 → proof_of_portfolio-0.0.48}/pyproject.toml

@@ -5,12 +5,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "proof-of-portfolio"
-version = "0.0.47"
+version = "0.0.48"
 description = "Zero-Knowledge Proof framework for verifiable, private portfolio performance metrics"
 readme = "README.md"
 authors = [{ name = "Inference Labs, Inc.", email = "info@inferencelabs.com" }]
 requires-python = ">=3.10"
-dependencies = ["numpy", "colorama", "matplotlib", "toml", "scipy"]
+dependencies = ["numpy", "colorama", "matplotlib", "toml", "scipy", "bittensor"]
 
 [project.optional-dependencies]
 dev = ["black", "flake8", "pre-commit"]
@@ -33,3 +33,6 @@ include-package-data = true
     "demo/**/*",
     "returns_generator/**/*",
 ]
+
+[tool.ruff.lint]
+ignore = ["E741"]

proof_of_portfolio-0.0.48/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

proof_of_portfolio-0.0.47/setup.cfg

@@ -1,9 +0,0 @@
-[flake8]
-max-line-length = 88
-extend-ignore = E203,E501,E741
-exclude = build/,dist/,*.egg-info/
-
-[egg_info]
-tag_build = 
-tag_date = 0
-