pyoframe 0.0.9__py3-none-any.whl → 0.0.11__py3-none-any.whl

pyoframe/constants.py

@@ -6,12 +6,17 @@ Code is heavily based on the `linopy` package by Fabian Hofmann.
 MIT License
 """
 
+import importlib.metadata
+import typing
 from dataclasses import dataclass
 from enum import Enum
-import typing
 from typing import Literal, Optional, Union
+
 import polars as pl
+from packaging import version
 
+# We want to try and support multiple major versions of polars
+POLARS_VERSION = version.parse(importlib.metadata.version("polars"))
 
 COEF_KEY = "__coeff"
 VAR_KEY = "__variable_id"

pyoframe/core.py

@@ -15,6 +15,7 @@ from typing import (
 
 import pandas as pd
 import polars as pl
+from packaging import version
 
 from pyoframe._arithmetic import _add_expressions, _get_dimensions
 from pyoframe.constants import (
@@ -22,6 +23,7 @@ from pyoframe.constants import (
     CONST_TERM,
     CONSTRAINT_KEY,
     DUAL_KEY,
+    POLARS_VERSION,
     RC_COL,
     RESERVED_COL_KEYS,
     SLACK_COL,
@@ -271,7 +273,18 @@ class Set(ModelElement, SupportsMath, SupportPolarsMethodMixin):
         elif isinstance(set, Constraint):
             df = set.data.select(set.dimensions_unsafe)
         elif isinstance(set, SupportsMath):
-            df = set.to_expr().data.drop(RESERVED_COL_KEYS).unique(maintain_order=True)
+            if POLARS_VERSION.major < 1:
+                df = (
+                    set.to_expr()
+                    .data.drop(RESERVED_COL_KEYS)
+                    .unique(maintain_order=True)
+                )
+            else:
+                df = (
+                    set.to_expr()
+                    .data.drop(RESERVED_COL_KEYS, strict=False)
+                    .unique(maintain_order=True)
+                )
         elif isinstance(set, pd.Index):
             df = pl.from_pandas(pd.DataFrame(index=set).reset_index())
         elif isinstance(set, pd.DataFrame):
@@ -601,7 +614,7 @@ class Expression(ModelElement, SupportsMath, SupportPolarsMethodMixin):
         data = (
             self.data.join(
                 multiplier,
-                on=dims_in_common,
+                on=dims_in_common if len(dims_in_common) > 0 else None,
                 how="inner" if dims_in_common else "cross",
             )
             .with_columns(pl.col(COEF_KEY) * pl.col(COEF_KEY + "_right"))
@@ -1258,7 +1271,10 @@ class Variable(ModelElementWithId, SupportsMath, SupportPolarsMethodMixin):
         )
 
     def to_expr(self) -> Expression:
-        return self._new(self.data.drop(SOLUTION_KEY))
+        if POLARS_VERSION.major < 1:
+            return self._new(self.data.drop(SOLUTION_KEY))
+        else:
+            return self._new(self.data.drop(SOLUTION_KEY, strict=False))
 
     def _new(self, data: pl.DataFrame):
         e = Expression(data.with_columns(pl.lit(1.0).alias(COEF_KEY)))
@@ -1334,7 +1350,13 @@ class Variable(ModelElementWithId, SupportsMath, SupportPolarsMethodMixin):
 
         expr = self.to_expr()
         data = expr.data.rename({dim: "__prev"})
-        data = data.join(
-            wrapped, left_on="__prev", right_on="__next", how="inner"
-        ).drop(["__prev", "__next"])
+
+        if POLARS_VERSION.major < 1:
+            data = data.join(
+                wrapped, left_on="__prev", right_on="__next", how="inner"
+            ).drop(["__prev", "__next"])
+        else:
+            data = data.join(
+                wrapped, left_on="__prev", right_on="__next", how="inner"
+            ).drop(["__prev", "__next"], strict=False)
         return expr._new(data)

{pyoframe-0.0.9.dist-info → pyoframe-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyoframe
-Version: 0.0.9
+Version: 0.0.11
 Summary: Blazing fast linear program interface
 Author-email: Bravos Power <dev@bravospower.com>
 Project-URL: Homepage, https://bravos-power.github.io/pyoframe/
@@ -15,10 +15,11 @@ Classifier: Natural Language :: English
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: polars ==0.20.27
+Requires-Dist: polars <2,>=0.20
 Requires-Dist: numpy
 Requires-Dist: pyarrow
 Requires-Dist: pandas
+Requires-Dist: packaging
 Provides-Extra: dev
 Requires-Dist: black ; extra == 'dev'
 Requires-Dist: bumpver ; extra == 'dev'

{pyoframe-0.0.9.dist-info → pyoframe-0.0.11.dist-info}/RECORD

@@ -1,7 +1,7 @@
 pyoframe/__init__.py,sha256=D7HHQPy2Me-LLyfPCcSE74dn83PeMK3aOby7i7oiLTs,507
 pyoframe/_arithmetic.py,sha256=riyN2JC-BnOgTIxGfXKIS-X_p7zm8JaKrLk_KDwKAAw,9046
-pyoframe/constants.py,sha256=olao24mkzQfwTlc5o4rQ-AOOTytmtVqNCFwJIc8zbds,7169
-pyoframe/core.py,sha256=UKWVs75VGmV_M67dASwHwGBDKhn4GR6uWyPCXShBe6U,51144
+pyoframe/constants.py,sha256=WoWNVsTeAqOHdUPkaZqFR3X3swrsf7OQnZ9AOaUF3uE,7358
+pyoframe/core.py,sha256=co4Z-i2AZ4jpvqfTKG67AKcBSFputZ0QrTtrglfkOzQ,51915
 pyoframe/io.py,sha256=DJUQ-WlxYe-Ya49pn_T3z6HhJxSD2LSdxm43AGqLuXw,7106
 pyoframe/io_mappers.py,sha256=Op5451Yo4gNa-2BiPPCAjPYdFLo8jIeKHCYXUcGPRug,7385
 pyoframe/model.py,sha256=xod3hSf__WWDy0V9pao9wPlQTc7-7x56FJoKKidsMbw,3768
@@ -11,8 +11,8 @@ pyoframe/objective.py,sha256=JzuyMAQZ2OxEoAaK-splWwZei2hHPbCLdG-X2-yRkD0,1338
 pyoframe/solvers.py,sha256=yf-hzUHDvKgmIHk2FobmygzE9-LnOzTBL5ps-nqGo8I,11875
 pyoframe/user_defined.py,sha256=UWZSTpFj0a8n1_RHwC8Ubwqr4FO-gRPBqqfNUut1IZg,1717
 pyoframe/util.py,sha256=KJubFV66E7WPI5UhcuUNsVwCm7WOcQBiLN1af1MAAgA,9647
-pyoframe-0.0.9.dist-info/LICENSE,sha256=L1pXz6p_1OW5XGWb2UCR6PNu6k3JAT0XWhi8jV0cuRg,1137
-pyoframe-0.0.9.dist-info/METADATA,sha256=H79iBoBvQwKDN3WGMds0PfyVarpW6y0_W69oA8upwIU,3435
-pyoframe-0.0.9.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-pyoframe-0.0.9.dist-info/top_level.txt,sha256=10z3OOJSVLriQ0IrFLMH8CH9zByugPWolqhlHlkNjV4,9
-pyoframe-0.0.9.dist-info/RECORD,,
+pyoframe-0.0.11.dist-info/LICENSE,sha256=L1pXz6p_1OW5XGWb2UCR6PNu6k3JAT0XWhi8jV0cuRg,1137
+pyoframe-0.0.11.dist-info/METADATA,sha256=qtlWiEBTxnFXguG57ZfmJ0rG4AcjOad5HM3a2CFJym8,3461
+pyoframe-0.0.11.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+pyoframe-0.0.11.dist-info/top_level.txt,sha256=10z3OOJSVLriQ0IrFLMH8CH9zByugPWolqhlHlkNjV4,9
+pyoframe-0.0.11.dist-info/RECORD,,

{pyoframe-0.0.9.dist-info → pyoframe-0.0.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.3.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any