gamspy 1.15.1__tar.gz → 1.16.0__tar.gz

{gamspy-1.15.1 → gamspy-1.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gamspy
-Version: 1.15.1
+Version: 1.16.0
 Summary: Python-based algebraic modeling interface to GAMS
 Author-email: GAMS Development Corporation <support@gams.com>
 Project-URL: homepage, https://gams.com/sales/gamspy_facts/
@@ -19,11 +19,11 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS
@@ -31,13 +31,12 @@ Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: gamsapi[transfer]==50.4.1
-Requires-Dist: gamspy_base==50.4.1
+Requires-Dist: gamsapi[transfer]>=51.1.0
+Requires-Dist: gamspy_base>=51.1.0
 Requires-Dist: pydantic>=2.0
 Requires-Dist: certifi>=2022.09.14
 Requires-Dist: urllib3>=2.0.7
-Requires-Dist: typer>=0.15.1
-Requires-Dist: click<8.2.0
+Requires-Dist: typer>=0.16.0
 Provides-Extra: dev
 Requires-Dist: ruff==0.12.0; extra == "dev"
 Requires-Dist: pre-commit>=3.5.0; extra == "dev"
@@ -67,6 +66,7 @@ Requires-Dist: nbmake>=1.5.3; extra == "doc"
 Requires-Dist: openpyxl>=3.1.2; extra == "doc"
 Requires-Dist: sphinx-tabs>=3.4.7; extra == "doc"
 Requires-Dist: towncrier>=24.8.0; extra == "doc"
+Requires-Dist: geopandas>=1.1.1; extra == "doc"
 Provides-Extra: torch
 Requires-Dist: torch>=2.7.0; extra == "torch"
 Dynamic: license-file

{gamspy-1.15.1 → gamspy-1.16.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gamspy"
-version = "1.15.1"
+version = "1.16.0"
 authors = [
   { name = "GAMS Development Corporation", email = "support@gams.com" },
 ]
@@ -25,24 +25,23 @@ classifiers = [
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Operating System :: POSIX",
   "Operating System :: Unix",
   "Operating System :: MacOS",
   "Operating System :: Microsoft :: Windows",
 ]
 dependencies = [
-  "gamsapi[transfer] == 50.4.1",
-  "gamspy_base == 50.4.1",
+  "gamsapi[transfer] >= 51.1.0",
+  "gamspy_base >= 51.1.0",
   "pydantic >= 2.0",
   "certifi >= 2022.09.14",
   "urllib3 >= 2.0.7",
-  "typer >= 0.15.1",
-  "click < 8.2.0",
+  "typer >= 0.16.0",
 ]
 
 [project.urls]
@@ -86,6 +85,7 @@ doc = [
   "openpyxl>=3.1.2",
   "sphinx-tabs>=3.4.7",
   "towncrier>= 24.8.0",
+  "geopandas >= 1.1.1",
 ]
 
 torch = [

{gamspy-1.15.1 → gamspy-1.16.0}/src/gamspy/_algebra/condition.py

@@ -2,12 +2,14 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+import gamspy._algebra.domain as domain
 import gamspy._algebra.expression as expression
 import gamspy._algebra.operable as operable
 import gamspy._symbols as syms
 import gamspy._symbols.implicits as implicits
 import gamspy.utils as utils
 from gamspy._symbols.implicits.implicit_symbol import ImplicitSymbol
+from gamspy._symbols.symbol import Symbol
 
 if TYPE_CHECKING:
     import pandas as pd
@@ -103,6 +105,9 @@ class Condition(operable.Operable):
         if isinstance(self.conditioning_on, ImplicitSymbol):
             self.conditioning_on.parent._assignment = statement
             self.conditioning_on.parent._winner = "gams"
+        elif isinstance(self.conditioning_on, Symbol):
+            self.conditioning_on._assignment = statement
+            self.conditioning_on._winner = "gams"
 
         if isinstance(self.conditioning_on, implicits.ImplicitEquation):
             self.conditioning_on.parent._definition = statement
@@ -123,13 +128,38 @@ class Condition(operable.Operable):
     def records(self) -> pd.DataFrame | None:
         assert self.container is not None
         assert self.domain is not None
-        temp_name = "a" + utils._get_unique_name()
-        temp_param = syms.Parameter._constructor_bypass(
-            self.container, temp_name, self.domain
-        )
-        temp_param[...] = self
-        del self.container.data[temp_name]
-        return temp_param.records
+        if isinstance(
+            self.conditioning_on,
+            (syms.Set, syms.Alias, implicits.ImplicitSet),
+        ):
+            temp_name = "c" + utils._get_unique_name()
+            temp_sym = syms.Set._constructor_bypass(
+                self.container,
+                temp_name,
+                self.domain,  # type: ignore
+            )
+            temp_sym[...] = self
+            del self.container.data[temp_name]
+        elif isinstance(self.conditioning_on, domain.Domain):
+            temp_name = "c" + utils._get_unique_name()
+            temp_sym = syms.Set._constructor_bypass(
+                self.container,
+                temp_name,
+                self.domain,  # type: ignore
+            )
+            temp_sym[...].where[self.condition] = True
+            del self.container.data[temp_name]
+        else:
+            temp_name = "c" + utils._get_unique_name()
+            temp_sym = syms.Parameter._constructor_bypass(
+                self.container,
+                temp_name,
+                self.domain,  # type: ignore
+            )
+            temp_sym[...] = self
+            del self.container.data[temp_name]
+
+        return temp_sym.records
 
     def gamsRepr(self) -> str:
         condition_str = (

{gamspy-1.15.1 → gamspy-1.16.0}/src/gamspy/_algebra/domain.py

@@ -39,6 +39,7 @@ class Domain:
         self._sanity_check(sets)
         self.sets = sets
         self.container = self._find_container()  # type: ignore
+        self.domain = sets
         self.where = condition.Condition(self)
 
     def __repr__(self) -> str:

{gamspy-1.15.1 → gamspy-1.16.0}/src/gamspy/_algebra/operation.py

@@ -744,12 +744,18 @@ class Ord(operable.Operable):
 
     """
 
-    def __init__(self, symbol: Set | Alias):
+    def __new__(cls, symbol: Set | Alias):
         if not isinstance(symbol, (syms.Set, syms.Alias)):
             raise ValidationError(
                 "Ord operation is only for Set and Alias objects!"
             )
 
+        if symbol.is_singleton:
+            return 1
+
+        return super().__new__(cls)
+
+    def __init__(self, symbol: Set | Alias):
         self._symbol = symbol
         self.container = symbol.container
         self.domain: list[Set | Alias] = []

{gamspy-1.15.1 → gamspy-1.16.0}/src/gamspy/_backend/engine.py

@@ -13,9 +13,6 @@ import urllib.parse
 import zipfile
 from typing import TYPE_CHECKING
 
-import certifi
-import urllib3
-
 import gamspy._backend.backend as backend
 import gamspy.utils as utils
 from gamspy._options import Options
@@ -747,9 +744,7 @@ class EngineClient:
         self.is_blocking = is_blocking
         self.tokens: list[str] = []
 
-        self._http = urllib3.PoolManager(
-            cert_reqs="CERT_REQUIRED", ca_certs=certifi.where()
-        )
+        self._http = utils._make_http()
 
         self._engine_config = EngineConfiguration(
             self.host,

{gamspy-1.15.1 → gamspy-1.16.0}/src/gamspy/_cli/install.py

@@ -5,7 +5,6 @@ import shutil
 import sys
 from typing import Annotated, Iterable, Optional, Union
 
-import certifi
 import typer
 from gamspy.exceptions import GamspyException, ValidationError
 import gamspy.utils as utils
@@ -35,8 +34,6 @@ def license(
     import json
     from urllib.parse import urlencode
 
-    import urllib3
-
     os.makedirs(utils.DEFAULT_DIR, exist_ok=True)
 
     is_alp = not os.path.isfile(license)
@@ -56,10 +53,8 @@ def license(
 
         # Make cmex_type check only for GAMS license server.
         if server == "https://license.gams.com":
-            http = urllib3.PoolManager(
-                cert_reqs="CERT_REQUIRED",
-                ca_certs=certifi.where()
-            )
+            http = utils._make_http()
+
             encoded_args = urlencode({"access_token": alp_id})
             request = http.request(
                 "GET", f"{server}/license-type?" + encoded_args

{gamspy-1.15.1 → gamspy-1.16.0}/src/gamspy/_symbols/equation.py

@@ -34,9 +34,9 @@ if TYPE_CHECKING:
     from gamspy._types import EllipsisType
 
 
-eq_types = ["=e=", "=l=", "=g="]
+EQ_TYPES = ["=e=", "=l=", "=g=", "=n=", "=x=", "=b="]
 
-non_regular_map = {
+IRREGULAR_EQ_MAP = {
     "nonbinding": "=n=",
     "external": "=x=",
     "boolean": "=b=",
@@ -44,10 +44,10 @@ non_regular_map = {
 
 
 class EquationType(Enum):
-    REGULAR = "REGULAR"
-    NONBINDING = "NONBINDING"
-    EXTERNAL = "EXTERNAL"
-    BOOLEAN = "BOOLEAN"
+    REGULAR = "regular"
+    NONBINDING = "nonbinding"
+    EXTERNAL = "external"
+    BOOLEAN = "boolean"
 
     @classmethod
     def values(cls):
@@ -527,18 +527,25 @@ class Equation(gt.Equation, Symbol):
 
     def _set_definition(self, domain, rhs):
         # self[domain] = rhs
+        rhs_repr = rhs.gamsRepr()
+        if self.type == "nonbinding" and not any(
+            eq_type in rhs_repr for eq_type in EQ_TYPES
+        ):
+            # x - c -> x - c == 0
+            rhs = rhs == 0
 
-        if not any(eq_type in rhs.gamsRepr() for eq_type in eq_types):
+        rhs_repr = rhs.gamsRepr()
+        if not any(eq_type in rhs_repr for eq_type in EQ_TYPES):
             raise ValidationError(
                 "Equation definition must contain at least one equality sign such as ==, <= or >=."
             )
 
+        if self.type in IRREGULAR_EQ_MAP and "=e=" in rhs_repr:
+            rhs.operator = IRREGULAR_EQ_MAP[self.type]
+
         if self.type == "external" and "=e=" not in rhs.gamsRepr():
             raise ValidationError("External equations must contain ==")
 
-        if self.type in non_regular_map:
-            rhs._replace_operator(non_regular_map[self.type])
-
         statement = expression.Expression(
             implicits.ImplicitEquation(
                 self,
@@ -1122,10 +1129,13 @@ class Equation(gt.Equation, Symbol):
         >>> i = gp.Set(m, "i", records=['i1','i2'])
         >>> e = gp.Equation(m, "e", domain=[i])
         >>> e.gamsRepr()
-        'e'
+        'e(i)'
 
         """
-        return self.name
+        representation = self.name
+        if self.domain:
+            representation += self._get_domain_str(self._domain_forwarding)
+        return representation
 
     def latexRepr(self) -> str:
         if self._definition is None:
@@ -1255,7 +1265,8 @@ class Equation(gt.Equation, Symbol):
 
 def cast_type(type: str | EquationType) -> str:
     if isinstance(type, str):
-        if type.lower() not in (
+        type = type.lower()
+        if type not in (
             "eq",
             "geq",
             "leq",
@@ -1270,7 +1281,7 @@ def cast_type(type: str | EquationType) -> str:
             )
 
         # assign eq by default
-        if type.upper() == "REGULAR":
+        if type == "regular":
             type = "eq"
 
     elif isinstance(type, EquationType):

{gamspy-1.15.1 → gamspy-1.16.0}/src/gamspy/_symbols/implicits/implicit_equation.py

@@ -139,7 +139,7 @@ class ImplicitEquation(ImplicitSymbol):
         return self.parent.slack
 
     @property
-    def records(self) -> pd.DataFrame | float | None:
+    def records(self) -> pd.DataFrame | None:
         if self.parent.records is None:
             return None
 

{gamspy-1.15.1 → gamspy-1.16.0}/src/gamspy/_symbols/implicits/implicit_parameter.py

@@ -157,7 +157,7 @@ class ImplicitParameter(ImplicitSymbol, operable.Operable):
         return f"ImplicitParameter(parent={self.parent}, name='{self.name}', domain={self.domain}, permutation={self.permutation}), parent_scalar_domains={self.parent_scalar_domains})"
 
     @property
-    def records(self) -> pd.DataFrame | float | None:
+    def records(self) -> pd.DataFrame | None:
         if self.parent.records is None:
             return None
 
@@ -179,20 +179,16 @@ class ImplicitParameter(ImplicitSymbol, operable.Operable):
             for i, d in self._scalar_domains:
                 domain.insert(i, d)
 
+            if domain == []:
+                domain = [...]
+
             temp_param[domain] = self[...]
             del self.container.data[temp_name]
 
             recs = temp_param.records
-            if len(recs) == 1:
-                return float(recs["value"].squeeze())
-
             return recs
         elif isinstance(self.parent, (syms.Variable, syms.Equation)):
             extension = self.name.split(".")[-1]
-            if self.parent.dimension == 0:
-                extension = ATTR_MAPPING[extension]
-                return float(self.parent.records[extension].squeeze())
-
             temp_name = "ip" + utils._get_unique_name()
             temp_param = syms.Parameter._constructor_bypass(
                 self.container, temp_name, self.parent.domain
@@ -201,6 +197,9 @@ class ImplicitParameter(ImplicitSymbol, operable.Operable):
             for i, d in self._scalar_domains:
                 domain.insert(i, d)
 
+            if domain == []:
+                domain = [...]
+
             temp_param[domain] = self
             del self.container.data[temp_name]
 
@@ -213,9 +212,6 @@ class ImplicitParameter(ImplicitSymbol, operable.Operable):
             columns[columns.index("value")] = extension
             recs.columns = columns
 
-            if len(recs) == 1:
-                return float(recs[extension].squeeze())
-
             return recs
 
         return None

{gamspy-1.15.1 → gamspy-1.16.0}/src/gamspy/_symbols/implicits/implicit_variable.py

@@ -214,7 +214,7 @@ class ImplicitVariable(ImplicitSymbol, operable.Operable):
         return permute(self, dims)  # type: ignore
 
     @property
-    def records(self) -> pd.DataFrame | float | None:
+    def records(self) -> pd.DataFrame | None:
         if self.parent.records is None:
             return None
 

{gamspy-1.15.1 → gamspy-1.16.0}/src/gamspy/formulations/ml/gradient_boosting.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 import importlib
+import itertools
 import uuid
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 import gamspy as gp
 import gamspy.formulations.utils as utils
@@ -14,6 +15,14 @@ if TYPE_CHECKING:
     from sklearn.ensemble import GradientBoostingRegressor
     from sklearn.tree import DecisionTreeRegressor
 
+    from gamspy import (
+        Alias,
+        Equation,
+        Parameter,
+        Set,
+        Variable,
+    )
+
 
 class GradientBoosting:
     """
@@ -155,26 +164,42 @@ class GradientBoosting:
         gb_out_list: list[gp.Variable] = []
         gb_eqn_list: list[gp.Equation] = []
 
-        for regression_tree in self._list_of_trees:
-            dt_out, dt_eqn, set_of_output_dim = regression_tree(
-                input, M, is_ensemble=True
-            )
-            gb_out_list.append(dt_out)
-            gb_eqn_list += dt_eqn
+        set_records_total: dict[
+            Set | Alias | Parameter | Variable | Equation, Any
+        ] = {}
+
+        results = (
+            regression_tree._yield_call(input, M)
+            for regression_tree in self._list_of_trees
+        )
+
+        zipped_results = zip(*results)
+        dt_outs = next(zipped_results)
+        gb_out_list.extend(dt_outs)
+
+        set_records_iter = next(zipped_results)
+        set_of_output_dim = None
+        for item, set_records_dict in set_records_iter:
+            set_records_total.update(set_records_dict)
+            set_of_output_dim = item
+
+        self.container.setRecords(set_records_total)
+
+        gb_eqn_list = list(itertools.chain.from_iterable(next(zipped_results)))
 
         set_of_samples = input.domain[0]
 
         out = gp.Variable._constructor_bypass(
             self.container,
             name=utils._generate_name("v", self._name_prefix, "real_output"),
-            domain=[set_of_samples, set_of_output_dim],
+            domain=[set_of_samples, set_of_output_dim],  # type: ignore
         )
 
         gb_eqn = gp.Equation._constructor_bypass(
             self.container,
             name=utils._generate_name("e", self._name_prefix, "gb_eqn"),
-            domain=[set_of_samples, set_of_output_dim],
-            description="perdicted out should be equal to the sum of gradient descent out times the learning rate.",
+            domain=[set_of_samples, set_of_output_dim],  # type: ignore
+            description="predicted out should be equal to the sum of gradient descent out times the learning rate.",
         )
 
         self.container._synch_with_gams(gams_to_gamspy=True)

{gamspy-1.15.1 → gamspy-1.16.0}/src/gamspy/formulations/ml/random_forest.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 import importlib
+import itertools
 import uuid
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 import gamspy as gp
 import gamspy.formulations.utils as utils
@@ -14,6 +15,14 @@ if TYPE_CHECKING:
     from sklearn.ensemble import RandomForestRegressor
     from sklearn.tree import DecisionTreeRegressor
 
+    from gamspy import (
+        Alias,
+        Equation,
+        Parameter,
+        Set,
+        Variable,
+    )
+
 
 class RandomForest:
     """
@@ -138,25 +147,41 @@ class RandomForest:
         previous_value = gp.get_option("DOMAIN_VALIDATION")
         gp.set_options({"DOMAIN_VALIDATION": 0})
 
-        for regression_tree in self._list_of_trees:
-            dt_out, dt_eqn, set_of_output_dim = regression_tree(
-                input, M, is_ensemble=True
-            )
-            rf_out_list.append(dt_out)
-            rf_eqn_list += dt_eqn
+        set_records_total: dict[
+            Set | Alias | Parameter | Variable | Equation, Any
+        ] = {}
+
+        results = (
+            regression_tree._yield_call(input, M)
+            for regression_tree in self._list_of_trees
+        )
+
+        zipped_results = zip(*results)
+        dt_outs = next(zipped_results)
+        rf_out_list.extend(dt_outs)
+
+        set_records_iter = next(zipped_results)
+        set_of_output_dim = None
+        for item, set_records_dict in set_records_iter:
+            set_records_total.update(set_records_dict)
+            set_of_output_dim = item
+
+        self.container.setRecords(set_records_total)
+
+        rf_eqn_list = list(itertools.chain.from_iterable(next(zipped_results)))
 
         set_of_samples = input.domain[0]
 
         out = gp.Variable._constructor_bypass(
             self.container,
             name=utils._generate_name("v", self._name_prefix, "real_output"),
-            domain=[set_of_samples, set_of_output_dim],
+            domain=[set_of_samples, set_of_output_dim],  # type: ignore
         )
 
         rf_eqn = gp.Equation._constructor_bypass(
             self.container,
             name=utils._generate_name("e", self._name_prefix, "rf_eqn"),
-            domain=[set_of_samples, set_of_output_dim],
+            domain=[set_of_samples, set_of_output_dim],  # type: ignore
             description="predicted out times number of estimators should be equal to the random forest out",
         )
 

{gamspy-1.15.1 → gamspy-1.16.0}/src/gamspy/formulations/ml/regression_tree.py

@@ -181,25 +181,11 @@ class RegressionTree:
 
         return node_lb, node_ub
 
-    def __call__(
+    def _yield_call(
         self,
         input: gp.Parameter | gp.Variable,
         M: float | None = None,
-        **kwargs,
-    ) -> tuple[gp.Variable, list[gp.Equation]]:
-        """
-        Generate output variable and equations required for embedding the regression tree.
-
-        Parameters
-        ----------
-        input : gp.Parameter | gp.Variable
-                input for the regression tree, must be in shape (sample_size, number_of_features)
-        M : float
-            value for the big_M. By default, infer the value using the available bounds for variables.
-            If the variable is unbounded, then default to 1e10.
-        """
-        is_ensemble = kwargs.get("is_ensemble", False)
-
+    ):
         leafs = self.children_left < 0
         leafs = leafs.nonzero()[0]
         nleafs = len(leafs)
@@ -266,6 +252,8 @@ class RegressionTree:
             domain=[set_of_samples, set_of_output_dim],
         )
 
+        yield out
+
         feat_vars = gp.Variable._constructor_bypass(
             self.container,
             name=utils._generate_name("v", self._name_prefix, "feature"),
@@ -426,19 +414,19 @@ class RegressionTree:
         lb_output._definition = definition
         self.container._add_statement(definition)
 
-        self.container.setRecords(
-            {
-                out_link: [
-                    (int(i), int(j), v)
-                    for i, j, v in np.stack(
-                        (idx, jdx, mapped_values), axis=-1
-                    ).reshape(-1, 3)
-                ],
-                feat_par: np.stack([node_lb, node_ub], axis=-1)[:, leafs, :],
-                max_out: np.max(self.value[leafs, :], axis=0),
-                min_out: np.min(self.value[leafs, :], axis=0),
-            }
-        )
+        set_records_dict = {
+            out_link: [
+                (int(i), int(j), v)
+                for i, j, v in np.stack(
+                    (idx, jdx, mapped_values), axis=-1
+                ).reshape(-1, 3)
+            ],
+            feat_par: np.stack([node_lb, node_ub], axis=-1)[:, leafs, :],
+            max_out: np.max(self.value[leafs, :], axis=0),
+            min_out: np.min(self.value[leafs, :], axis=0),
+        }
+
+        yield [set_of_output_dim, set_records_dict]
 
         ### This generates the set of possible paths given the input data
         mask = (feat_vars.up[...] >= feat_par[..., lb]) & (
@@ -545,9 +533,30 @@ class RegressionTree:
             ge_cons,
             le_cons,
         ]
+        yield eqns
 
-        if is_ensemble:
-            return out, eqns, set_of_output_dim  # type: ignore
+    def __call__(
+        self,
+        input: gp.Parameter | gp.Variable,
+        M: float | None = None,
+    ) -> tuple[gp.Variable, list[gp.Equation]]:
+        """
+        Generate output variable and equations required for embedding the regression tree.
 
-        else:
-            return out, eqns
+        Parameters
+        ----------
+        input : gp.Parameter | gp.Variable
+                input for the regression tree, must be in shape (sample_size, number_of_features)
+        M : float
+            value for the big_M. By default, infer the value using the available bounds for variables.
+            If the variable is unbounded, then default to 1e10.
+        """
+
+        generator = self._yield_call(input, M)
+
+        output = next(generator)
+        _, set_values = next(generator)
+        input.container.setRecords(set_values)
+        eqs = next(generator)
+
+        return output, eqs

{gamspy-1.15.1 → gamspy-1.16.0}/src/gamspy/math/matrix.py

@@ -223,7 +223,9 @@ def _generate_dims(
         expected_name = f"DenseDim{x}_1"
         find_x = m.data.get(expected_name, None)
         if find_x is None:
-            find_x = m.addSet(name=expected_name, records=range(x))
+            find_x = m.addSet(
+                name=expected_name, records=range(x), is_singleton=(x == 1)
+            )
 
         while find_x in sets_so_far:
             find_x = next_alias(find_x)

{gamspy-1.15.1 → gamspy-1.16.0}/src/gamspy/utils.py

@@ -7,7 +7,9 @@ import platform
 import uuid
 from typing import TYPE_CHECKING
 
+import certifi
 import gams.transfer as gt
+import urllib3
 from gams.core import gdx
 
 import gamspy._model as model
@@ -813,3 +815,17 @@ def _parse_generated_variables(model: Model, listing_file: str) -> None:
         variable._column_listing = listings
 
     return None
+
+
+def _make_http() -> urllib3.PoolManager:
+    proxy_url = os.getenv("HTTPS_PROXY") or os.getenv("HTTP_PROXY")
+    if proxy_url:
+        http = urllib3.ProxyManager(
+            proxy_url, cert_reqs="CERT_REQUIRED", ca_certs=certifi.where()
+        )
+    else:
+        http = urllib3.PoolManager(
+            cert_reqs="CERT_REQUIRED", ca_certs=certifi.where()
+        )
+
+    return http

{gamspy-1.15.1 → gamspy-1.16.0}/src/gamspy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gamspy
-Version: 1.15.1
+Version: 1.16.0
 Summary: Python-based algebraic modeling interface to GAMS
 Author-email: GAMS Development Corporation <support@gams.com>
 Project-URL: homepage, https://gams.com/sales/gamspy_facts/
@@ -19,11 +19,11 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS
@@ -31,13 +31,12 @@ Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: gamsapi[transfer]==50.4.1
-Requires-Dist: gamspy_base==50.4.1
+Requires-Dist: gamsapi[transfer]>=51.1.0
+Requires-Dist: gamspy_base>=51.1.0
 Requires-Dist: pydantic>=2.0
 Requires-Dist: certifi>=2022.09.14
 Requires-Dist: urllib3>=2.0.7
-Requires-Dist: typer>=0.15.1
-Requires-Dist: click<8.2.0
+Requires-Dist: typer>=0.16.0
 Provides-Extra: dev
 Requires-Dist: ruff==0.12.0; extra == "dev"
 Requires-Dist: pre-commit>=3.5.0; extra == "dev"
@@ -67,6 +66,7 @@ Requires-Dist: nbmake>=1.5.3; extra == "doc"
 Requires-Dist: openpyxl>=3.1.2; extra == "doc"
 Requires-Dist: sphinx-tabs>=3.4.7; extra == "doc"
 Requires-Dist: towncrier>=24.8.0; extra == "doc"
+Requires-Dist: geopandas>=1.1.1; extra == "doc"
 Provides-Extra: torch
 Requires-Dist: torch>=2.7.0; extra == "torch"
 Dynamic: license-file

{gamspy-1.15.1 → gamspy-1.16.0}/src/gamspy.egg-info/requires.txt

@@ -1,10 +1,9 @@
-gamsapi[transfer]==50.4.1
-gamspy_base==50.4.1
+gamsapi[transfer]>=51.1.0
+gamspy_base>=51.1.0
 pydantic>=2.0
 certifi>=2022.09.14
 urllib3>=2.0.7
-typer>=0.15.1
-click<8.2.0
+typer>=0.16.0
 
 [dev]
 ruff==0.12.0
@@ -28,6 +27,7 @@ nbmake>=1.5.3
 openpyxl>=3.1.2
 sphinx-tabs>=3.4.7
 towncrier>=24.8.0
+geopandas>=1.1.1
 
 [test]
 coverage[toml]>=7.2.7

{gamspy-1.15.1 → gamspy-1.16.0}/tests/test_gamspy.py

@@ -17,7 +17,7 @@ from gamspy.exceptions import GamspyException, ValidationError
 
 @pytest.mark.unit
 def test_version():
-    assert gp.__version__ == "1.15.1"
+    assert gp.__version__ == "1.16.0"
 
 
 @pytest.mark.unit