pyoframe 0.0.8__tar.gz → 0.0.10__tar.gz

{pyoframe-0.0.8/src/pyoframe.egg-info → pyoframe-0.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyoframe
-Version: 0.0.8
+Version: 0.0.10
 Summary: Blazing fast linear program interface
 Author-email: Bravos Power <dev@bravospower.com>
 Project-URL: Homepage, https://bravos-power.github.io/pyoframe/
@@ -15,11 +15,10 @@ 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: tqdm
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: bumpver; extra == "dev"

{pyoframe-0.0.8 → pyoframe-0.0.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyoframe"
-version = "0.0.8"
+version = "0.0.10"
 authors = [{ name = "Bravos Power", email = "dev@bravospower.com" }]
 description = "Blazing fast linear program interface"
 readme = "README.md"
@@ -16,7 +16,7 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Natural Language :: English",
 ]
-dependencies = ["polars==0.20.27", "numpy", "pyarrow", "pandas", "tqdm"]
+dependencies = ["polars>=0.20,<2", "numpy", "pyarrow", "pandas"]
 
 [project.optional-dependencies]
 dev = [

{pyoframe-0.0.8 → pyoframe-0.0.10}/src/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-0.0.8 → pyoframe-0.0.10}/src/pyoframe/core.py

@@ -1,19 +1,21 @@
 from __future__ import annotations
+
+from abc import ABC, abstractmethod
 from typing import (
+    TYPE_CHECKING,
     Iterable,
     List,
     Mapping,
+    Optional,
     Protocol,
     Sequence,
-    overload,
     Union,
-    Optional,
-    TYPE_CHECKING,
+    overload,
 )
-from abc import ABC, abstractmethod
 
 import pandas as pd
 import polars as pl
+from packaging import version
 
 from pyoframe._arithmetic import _add_expressions, _get_dimensions
 from pyoframe.constants import (
@@ -21,33 +23,33 @@ from pyoframe.constants import (
     CONST_TERM,
     CONSTRAINT_KEY,
     DUAL_KEY,
+    POLARS_VERSION,
+    RC_COL,
     RESERVED_COL_KEYS,
     SLACK_COL,
-    VAR_KEY,
     SOLUTION_KEY,
-    RC_COL,
-    VType,
-    VTypeValue,
+    VAR_KEY,
     Config,
     ConstraintSense,
-    UnmatchedStrategy,
-    PyoframeError,
     ObjSense,
+    PyoframeError,
+    UnmatchedStrategy,
+    VType,
+    VTypeValue,
+)
+from pyoframe.model_element import (
+    ModelElement,
+    ModelElementWithId,
+    SupportPolarsMethodMixin,
 )
 from pyoframe.util import (
+    FuncArgs,
     cast_coef_to_string,
     concat_dimensions,
+    dataframe_to_tupled_list,
     get_obj_repr,
     parse_inputs_as_iterable,
     unwrap_single_values,
-    dataframe_to_tupled_list,
-    FuncArgs,
-)
-
-from pyoframe.model_element import (
-    ModelElement,
-    ModelElementWithId,
-    SupportPolarsMethodMixin,
 )
 
 if TYPE_CHECKING:  # pragma: no cover
@@ -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"))
@@ -692,7 +705,9 @@ class Expression(ModelElement, SupportsMath, SupportPolarsMethodMixin):
             >>> m.expr_1 = 2 * m.X + 1
             >>> m.expr_2 = pf.sum(m.expr_1)
             >>> m.objective = m.expr_2 - 3
-            >>> result = m.solve(log_to_console=False)
+            >>> result = m.solve(log_to_console=False) # doctest: +ELLIPSIS
+            <BLANKLINE>
+            ...
             >>> m.expr_1.value
             shape: (3, 2)
             ┌──────┬──────────┐
@@ -1003,13 +1018,9 @@ class Constraint(ModelElementWithId):
             >>> m.hours_spent = pf.Variable(homework_due_tomorrow[["project"]], lb=0)
             >>> m.must_finish_project = m.hours_spent >= homework_due_tomorrow[["project", "hours_to_finish"]]
             >>> m.only_one_day = sum("project", m.hours_spent) <= 24
-            >>> m.solve(log_to_console=False)
-            Status: warning
-            Termination condition: infeasible
-            <BLANKLINE>
-
             >>> _ = m.must_finish_project.relax(homework_due_tomorrow[["project", "cost_per_hour_underdelivered"]], max=homework_due_tomorrow[["project", "max_underdelivered"]])
-            >>> result = m.solve(log_to_console=False)
+            >>> _ = m.solve(log_to_console=False) # doctest: +ELLIPSIS
+            \rWriting ...
             >>> m.hours_spent.solution
             shape: (3, 2)
             ┌─────────┬──────────┐
@@ -1029,7 +1040,8 @@ class Constraint(ModelElementWithId):
             >>> m.hours_spent = pf.Variable(homework_due_tomorrow[["project"]], lb=0)
             >>> m.must_finish_project = (m.hours_spent >= homework_due_tomorrow[["project", "hours_to_finish"]]).relax(5)
             >>> m.only_one_day = (sum("project", m.hours_spent) <= 24).relax(1)
-            >>> _ = m.solve(log_to_console=False)
+            >>> _ = m.solve(log_to_console=False) # doctest: +ELLIPSIS
+            \rWriting ...
             >>> m.objective.value
             -3.0
             >>> m.hours_spent.solution
@@ -1259,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)))
@@ -1335,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.8 → pyoframe-0.0.10}/src/pyoframe/io.py

@@ -2,11 +2,12 @@
 Module containing all import/export functionalities.
 """
 
+import sys
+import time
 from io import TextIOWrapper
-from tempfile import NamedTemporaryFile
 from pathlib import Path
+from tempfile import NamedTemporaryFile
 from typing import TYPE_CHECKING, Iterable, Optional, TypeVar, Union
-from tqdm import tqdm
 
 from pyoframe.constants import CONST_TERM, VAR_KEY, ObjSense
 from pyoframe.core import Constraint, Variable
@@ -24,6 +25,57 @@ if TYPE_CHECKING:  # pragma: no cover
 
 import polars as pl
 
+T = TypeVar("T")
+
+
+def io_progress_bar(
+    iterable: Iterable[T],
+    prefix: str = "",
+    suffix: str = "",
+    length: int = 50,
+    fill: str = "█",
+    update_every: int = 1,
+):
+    """
+    Display progress bar for I/O operations.
+    """
+    try:
+        total = len(iterable)
+    except TypeError:
+        total = None
+
+    start_time = time.time()
+
+    def print_progress(iteration: int):
+        if total is not None:
+            percent = f"{100 * (iteration / float(total)):.1f}"
+            filled_length = int(length * iteration // total)
+            bar = fill * filled_length + "-" * (length - filled_length)
+        else:
+            percent = "N/A"
+            bar = fill * (iteration % length) + "-" * (length - (iteration % length))
+        elapsed_time = time.time() - start_time
+        if iteration > 0:
+            estimated_total_time = (
+                elapsed_time * (total / iteration) if total else elapsed_time
+            )
+            estimated_remaining_time = estimated_total_time - elapsed_time
+            eta = time.strftime("%H:%M:%S", time.gmtime(estimated_remaining_time))
+        else:
+            eta = "Estimating..."  # pragma: no cover
+        sys.stdout.write(
+            f'\r{prefix} |{bar}| {percent}% Complete ({iteration}/{total if total else "?"}) ETA: {eta} {suffix}'
+        )
+        sys.stdout.flush()
+
+    for i, item in enumerate(iterable):
+        yield item
+        if (i + 1) % update_every == 0 or total is None or i == total - 1:
+            print_progress(i + 1)
+
+    sys.stdout.write("\n")
+    sys.stdout.flush()
+
 
 def objective_to_file(m: "Model", f: TextIOWrapper, var_map):
     """
@@ -41,7 +93,11 @@ def objective_to_file(m: "Model", f: TextIOWrapper, var_map):
 
 def constraints_to_file(m: "Model", f: TextIOWrapper, var_map, const_map):
     for constraint in create_section(
-        tqdm(m.constraints, desc="Writing constraints to file"), f, "s.t."
+        io_progress_bar(
+            m.constraints, prefix="Writing constraints to file", update_every=5
+        ),
+        f,
+        "s.t.",
     ):
         f.write(constraint.to_str(var_map=var_map, const_map=const_map) + "\n")
 
@@ -58,7 +114,9 @@ def bounds_to_file(m: "Model", f, var_map):
         )
         f.write(f"{var_map.apply(const_term_df).item()} = 1\n")
 
-    for variable in tqdm(m.variables, desc="Writing bounds to file"):
+    for variable in io_progress_bar(
+        m.variables, prefix="Writing bounds to file", update_every=1
+    ):
         terms = []
 
         if variable.lb != 0:
@@ -88,7 +146,13 @@ def binaries_to_file(m: "Model", f, var_map: Mapper):
     Write out binaries of a model to a lp file.
     """
     for variable in create_section(
-        tqdm(m.binary_variables, "Writing binary variables to file"), f, "binary"
+        io_progress_bar(
+            m.binary_variables,
+            prefix="Writing binary variables to file",
+            update_every=1,
+        ),
+        f,
+        "binary",
     ):
         lines = (
             var_map.apply(variable.data, to_col=None)
@@ -103,7 +167,13 @@ def integers_to_file(m: "Model", f, var_map: Mapper):
     Write out integers of a model to a lp file.
     """
     for variable in create_section(
-        tqdm(m.integer_variables, "Writing integer variables to file"), f, "general"
+        io_progress_bar(
+            m.integer_variables,
+            prefix="Writing integer variables to file",
+            update_every=5,
+        ),
+        f,
+        "general",
     ):
         lines = (
             var_map.apply(variable.data, to_col=None)
@@ -113,9 +183,6 @@ def integers_to_file(m: "Model", f, var_map: Mapper):
         f.write(lines + "\n")
 
 
-T = TypeVar("T")
-
-
 def create_section(iterable: Iterable[T], f, section_header) -> Iterable[T]:
     wrote = False
     for item in iterable:

{pyoframe-0.0.8 → pyoframe-0.0.10/src/pyoframe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyoframe
-Version: 0.0.8
+Version: 0.0.10
 Summary: Blazing fast linear program interface
 Author-email: Bravos Power <dev@bravospower.com>
 Project-URL: Homepage, https://bravos-power.github.io/pyoframe/
@@ -15,11 +15,10 @@ 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: tqdm
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: bumpver; extra == "dev"

{pyoframe-0.0.8 → pyoframe-0.0.10}/src/pyoframe.egg-info/requires.txt

@@ -1,8 +1,7 @@
-polars==0.20.27
+polars<2,>=0.20
 numpy
 pyarrow
 pandas
-tqdm
 
 [dev]
 black