fix readAeson;add PoolWAS

Author: yellowbean

absbox/__init__.py

@@ -18,9 +18,9 @@
 from .local.cf import readBondsCf,readToCf,readFeesCf,readAccsCf,readPoolsCf,readFlowsByScenarios,readMultiFlowsByScenarios,readFieldsByScenarios
 from .local.cf import readInspect, readLedgers, readTriggers
 from .local.cf import BondCfHeader
-from .local.interface import readAeson, toAeson, fromAeson
+from .local.interface import readAeson 
 from .report import toHtml,OutputType,toExcel
 
 from . import examples
 
-__version__ = version("absbox")
+__version__ = version("absbox")

absbox/local/component.py

@@ -304,6 +304,10 @@ def mkDs(x):
                 if pNames:
                     return mkTag(("PoolScheduleCfPv", [mkLiqMethod(pricingMethod), lmap(mkPid,pNames)]))
                 return mkTag(("PoolScheduleCfPv", [mkLiqMethod(pricingMethod), None]))
+            case ("资产池加权利差", pNames) | ("PoolWaSpread", pNames):
+                if pNames:
+                    return mkTag(("PoolWaSpread", lmap(mkPid,pNames)))
+                return mkTag(("PoolWaSpread", None))
             case ("债券系数", bn) | ("bondFactor", bn):
                 return mkTag(("BondFactorOf", bn))
             case ("债券系数",) | ("bondFactor",):

requirements.txt

@@ -11,6 +11,5 @@ lenses
 rich
 graphviz
 dateparser
-pyxirr
 more-itertools
-pytest-notebook
+pytest-notebook

setup.cfg

@@ -44,7 +44,6 @@ install_requires =
     deepdiff
     dateparser
     more-itertools
-    pyxirr
     lenses
     xlsxwriter
 
@@ -53,4 +52,4 @@ minversion = 6.0
 addopts = -ra -q
 testpaths =
     absbox/tests
-    docs/source/nbsample
+    docs/source/nbsample

shell.nix

@@ -0,0 +1,21 @@
+{ pkgs ? import <nixpkgs> {} }:
+pkgs.mkShell {
+  buildInputs = [
+    pkgs.rustc
+    pkgs.cargo
+    pkgs.ninja 
+    pkgs.python313
+    pkgs.python313Packages.meson-python
+    pkgs.python313Packages.pillow 
+    pkgs.python313Packages.rpds-py 
+
+    pkgs.python313Packages.cython
+    pkgs.zeromq
+    pkgs.gcc
+    pkgs.pkg-config
+    pkgs.glibcLocales
+  ];
+  LANG = "en_US.UTF-8";
+  LC_ALL = "en_US.UTF-8";
+  LD_LIBRARY_PATH = "${pkgs.gcc.cc.lib}/lib:${pkgs.zeromq}/lib";
+}