rangekeeper 0.4.2a0__tar.gz → 0.4.4a0__tar.gz

{rangekeeper-0.4.2a0 → rangekeeper-0.4.4a0}/PKG-INFO

@@ -1,37 +1,39 @@
 Metadata-Version: 2.1
 Name: Rangekeeper
-Version: 0.4.2a0
+Version: 0.4.4a0
 Summary: A Python library assisting financial modelling in scenario planning, decision-making, cashflow forecasting, and the like
 License: MPL-2.0
 Author: Daniel Fink
 Author-email: danfink@mit.edu
-Requires-Python: >=3.9,<3.11
+Requires-Python: >=3.10,<3.13
 Classifier: License :: OSI Approved
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: Pint (>=0.20.1,<0.21.0)
 Requires-Dist: PyYAML (>=6.0,<7.0)
 Requires-Dist: aenum (>=3.1.11,<4.0.0)
 Requires-Dist: docutils (==0.17.1)
+Requires-Dist: ghp-import (>=2.1.0,<3.0.0)
 Requires-Dist: jupyter (>=1.0.0,<2.0.0)
-Requires-Dist: jupyter-book (>=0.15.1,<0.16.0)
+Requires-Dist: jupyter-book (>=1.0.0,<2.0.0)
 Requires-Dist: matplotlib (>=3.7.0,<4.0.0)
+Requires-Dist: mpld3 (>=0.5.10,<0.6.0)
 Requires-Dist: multiprocess (>=0.70.14,<0.71.0)
 Requires-Dist: networkx (>=3.0,<4.0)
-Requires-Dist: numba (>=0.57.0,<0.58.0)
+Requires-Dist: numba (>=0.59.0,<0.60.0)
 Requires-Dist: pandas (>=2.0.1,<3.0.0)
 Requires-Dist: plotly (>=5.15.0,<6.0.0)
 Requires-Dist: py-linq (>=1.4.0,<2.0.0)
 Requires-Dist: py-moneyed (>=3.0,<4.0)
-Requires-Dist: pyppeteer (>=1.0.2,<2.0.0)
+Requires-Dist: pyppeteer (>=2.0.0,<3.0.0)
 Requires-Dist: python-dateutil (>=2.8.2,<3.0.0)
 Requires-Dist: pyvis (>=0.3.2,<0.4.0)
-Requires-Dist: pyxirr (>=0.9.0,<0.10.0)
+Requires-Dist: pyxirr (>=0.10.3,<0.11.0)
 Requires-Dist: scipy (>=1.11.2,<2.0.0)
-Requires-Dist: seaborn (>=0.12.2,<0.13.0)
+Requires-Dist: seaborn (>=0.13.2,<0.14.0)
 Requires-Dist: specklepy (>=2.16.0,<3.0.0)
-Requires-Dist: sphinx-rtd-theme (>=1.2.0,<2.0.0)
 Requires-Dist: tabulate (>=0.9.0,<0.10.0)
 Requires-Dist: tqdm (>=4.65.0,<5.0.0)
 Description-Content-Type: text/markdown

{rangekeeper-0.4.2a0 → rangekeeper-0.4.4a0}/pyproject.toml

@@ -1,18 +1,18 @@
 [tool.poetry]
 name = "Rangekeeper"
-version = "0.4.2-alpha"
+version = "0.4.4-alpha"
 description = "A Python library assisting financial modelling in scenario planning, decision-making, cashflow forecasting, and the like"
 authors = ["Daniel Fink <danfink@mit.edu>"]
 license = "MPL-2.0"
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = ">=3.9, <3.11"
+python = ">=3.10, <3.13"
 aenum = "^3.1.11"
 matplotlib = "^3.7.0"
 pandas = "^2.0.1"
 Pint = "^0.20.1"
-pyxirr = "^0.9.0"
+pyxirr = "^0.10.3"
 scipy = "^1.11.2"
 networkx = "^3.0"
 py-moneyed = "^3.0"
@@ -21,18 +21,20 @@ py-linq = "^1.4.0"
 tabulate = "^0.9.0"
 PyYAML = "^6.0"
 specklepy = "^2.16.0"
-numba = "^0.57.0"
+numba = "^0.59.0"
 jupyter = "^1.0.0"
 #jupyterlab = "^4.0.5"
 docutils = "0.17.1" # See https://jupyterbook.org/en/stable/content/citations.html#citations-and-bibliographies
 tqdm = "^4.65.0"
 multiprocess = "^0.70.14"
-seaborn = "^0.12.2"
-jupyter-book = "^0.15.1"
-sphinx-rtd-theme = "^1.2.0"
+seaborn = "^0.13.2"
+jupyter-book = "^1.0.0"
+#sphinx-rtd-theme = "^1.2.0"
 pyvis = "^0.3.2"
 plotly = "^5.15.0"
-pyppeteer = "^1.0.2"
+pyppeteer = "^2.0.0"
+ghp-import = "^2.1.0"
+mpld3 = "^0.5.10"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.2.1"

{rangekeeper-0.4.2a0 → rangekeeper-0.4.4a0}/rangekeeper/flux.py

@@ -682,7 +682,7 @@ class Stream:
             period_type=self.period_type)
 
     def total(self) -> np.float64:
-        return self.sum().collapse().movements[0]
+        return self.sum().collapse().movements.iloc[0]
 
     def append(
             self,

{rangekeeper-0.4.2a0 → rangekeeper-0.4.4a0}/rangekeeper/graph.py

@@ -123,6 +123,9 @@ class Entity(objects.Base):
     def __eq__(self, other):
         return self.entityId == other.entityId
 
+    def __hash__(self):
+        return hash(self.entityId)
+
     def __init__(
             self,
             entityId: str = None,
@@ -134,6 +137,12 @@ class Entity(objects.Base):
             type=type if type is not None else '[Unknown]'
             )
 
+    def try_get_attribute(self, key):
+        try:
+            return self[key]
+        except KeyError:
+            return None
+
     @classmethod
     def from_base(
             cls,
@@ -284,7 +293,7 @@ class Entity(objects.Base):
         keys = properties
         if properties is None:
             keys = list(filter(lambda key: key not in filtered, self.get_member_names()))
-        attributes = {key: self[key] for key in keys}
+        attributes = {key: self.try_get_attribute(key) for key in keys}
         relationships = self.get_relationships(assembly=assembly)
         if arborescence is False:
             attributes['relationships'] = relationships
@@ -310,7 +319,7 @@ class Entity(objects.Base):
         if relationship_type is None:
             tree = assembly
         else:
-            tree = assembly.filter_by_relationship_type(relationship_type)
+            tree = assembly.filter_by_type(relationship_type=relationship_type)
         if not nx.is_arborescence(tree.graph):
             raise Exception('The Assembly is not a tree. Cannot calculate ancestors.')
 

{rangekeeper-0.4.2a0 → rangekeeper-0.4.4a0}/rangekeeper/measure.py

@@ -81,12 +81,12 @@ def register_currency(
     if '[currency]' not in registry._dimensions:
         registry.define('money = [currency]')
         registry.define(
-            '{0} = nan money = {0} = {1}'.format(
+            '{0} = [currency] = {0} = {1}'.format(
                 ''.join(currency.code.split()),
                 ''.join(currency.name.split())))
     else:
         registry.define(
-            '{0} = nan money = {0} = {1}'.format(
+            '{0} =[currency] = {0} = {1}'.format(
                 ''.join(currency.code.split()),
                 ''.join(currency.name.split())))
 

{rangekeeper-0.4.2a0 → rangekeeper-0.4.4a0}/rangekeeper/projection.py

@@ -144,6 +144,7 @@ class Extrapolation(Projection):
 
         return result
 
+
 class Distribution(Projection):
     form: rk.distribution.Form
 

{rangekeeper-0.4.2a0 → rangekeeper-0.4.4a0}/rangekeeper/space.py

@@ -17,9 +17,10 @@ class Space(rk.graph.Entity):
         super().__init__(
             name=name,
             type=type,
-            measurements=measurements,
-            events=events,
-            attributes=attributes)
+            # measurements=measurements,
+            # events=events,
+            # attributes=attributes
+        )
 
 
 class Apartment(Space):