gamspy 1.17.2__py3-none-any.whl → 1.18.1__py3-none-any.whl

gamspy/_backend/backend.py

@@ -12,6 +12,7 @@ from gamspy.exceptions import GamspyException, ValidationError
 
 if TYPE_CHECKING:
     import io
+    from pathlib import Path
 
     from gamspy import Container, Model, Options
     from gamspy._backend.engine import EngineClient, GAMSEngine
@@ -52,7 +53,7 @@ def backend_factory(
     container: Container,
     options: Options | None = None,
     solver: str | None = None,
-    solver_options: dict | None = None,
+    solver_options: dict | Path | None = None,
     output: io.TextIOWrapper | None = None,
     backend: Literal["local", "engine", "neos"] = "local",
     client: EngineClient | NeosClient | None = None,
@@ -126,7 +127,7 @@ class Backend(ABC):
         model: Model | None,
         options: Options,
         solver: str | None,
-        solver_options: dict | None,
+        solver_options: dict | Path | None,
         output: io.TextIOWrapper | None,
         load_symbols: list[Symbol] | None,
     ):

gamspy/_backend/engine.py

@@ -17,6 +17,7 @@ import requests
 
 import gamspy._backend.backend as backend
 import gamspy.utils as utils
+from gamspy._communication import send_job
 from gamspy._options import Options
 from gamspy.exceptions import (
     EngineClientException,
@@ -26,6 +27,8 @@ from gamspy.exceptions import (
 )
 
 if TYPE_CHECKING:
+    from pathlib import Path
+
     from gamspy import Container, Model
     from gamspy._symbols.symbol import Symbol
 
@@ -742,7 +745,7 @@ class GAMSEngine(backend.Backend):
         client: EngineClient | None,
         options: Options,
         solver: str,
-        solver_options: dict | None,
+        solver_options: dict | Path | None,
         output: io.TextIOWrapper | None,
         model: Model,
         load_symbols: list[Symbol] | None,
@@ -916,7 +919,7 @@ class GAMSEngine(backend.Backend):
         options._extra_options["save"] = self.restart_file
         options._export(self.pf_file)
 
-        self.container._send_job(self.job_name, self.pf_file)
+        send_job(self.container._comm_pair_id, self.job_name, self.pf_file)
 
     def _sync(self):
         symbols = utils._get_symbol_names_from_gdx(
@@ -931,7 +934,7 @@ class GAMSEngine(backend.Backend):
         options._set_extra_options(extra_options)
         options._export(self.pf_file)
 
-        self.container._send_job(self.job_name, self.pf_file)
+        send_job(self.container._comm_pair_id, self.job_name, self.pf_file)
 
     def _append_gamspy_files(self) -> list[str]:
         extra_model_files = self.client.extra_model_files + [self.restart_file]

gamspy/_backend/local.py

@@ -5,10 +5,12 @@ from typing import TYPE_CHECKING
 
 import gamspy._backend.backend as backend
 import gamspy._miro as miro
+from gamspy._communication import send_job
 from gamspy.exceptions import GamspyException, _customize_exception
 
 if TYPE_CHECKING:
     import io
+    from pathlib import Path
 
     from gamspy import Container, Model, Options
     from gamspy._symbols.symbol import Symbol
@@ -20,7 +22,7 @@ class Local(backend.Backend):
         container: Container,
         options: Options,
         solver: str | None,
-        solver_options: dict | None,
+        solver_options: dict | Path | None,
         output: io.TextIOWrapper | None,
         model: Model | None,
         load_symbols: list[Symbol] | None,
@@ -89,7 +91,9 @@ class Local(backend.Backend):
         self.options._export(self.pf_file, self.output)
 
         try:
-            self.container._send_job(self.job_name, self.pf_file, self.output)
+            send_job(
+                self.container._comm_pair_id, self.job_name, self.pf_file, self.output
+            )
 
             if not self.is_async() and self.model:
                 self.model._update_model_attributes()

gamspy/_backend/neos.py

@@ -7,12 +7,14 @@ import shutil
 import ssl
 import xmlrpc.client
 import zipfile
-from typing import TYPE_CHECKING
+from pathlib import Path
+from typing import TYPE_CHECKING, Any
 
 import certifi
 
 import gamspy._backend.backend as backend
 import gamspy.utils as utils
+from gamspy._communication import send_job
 from gamspy._options import Options
 from gamspy.exceptions import (
     GamspyException,
@@ -256,7 +258,7 @@ class NeosClient:
     def _prepare_xml(
         self,
         gams_string: str,
-        solver_options: dict | None,
+        solver_options: dict | Path | None,
         gdx_path: str,
         restart_path: str,
         options: Options,
@@ -282,6 +284,9 @@ class NeosClient:
 
         solver_options_str = ""
         if solver_options:
+            if isinstance(solver_options, Path):
+                solver_options = _parse_solver_options(solver_options)
+
             solver_options_str = "\n".join(
                 [f"{key} {value}" for key, value in solver_options.items()]
             )
@@ -380,7 +385,7 @@ class NEOSServer(backend.Backend):
         container: Container,
         options: Options,
         solver: str,
-        solver_options: dict | None,
+        solver_options: dict | Path | None,
         client: NeosClient | None,
         output: io.TextIOWrapper | None,
         model: Model,
@@ -527,7 +532,7 @@ class NEOSServer(backend.Backend):
         options._extra_options["save"] = self.restart_file
         options._export(self.pf_file)
 
-        self.container._send_job(self.job_name, self.pf_file)
+        send_job(self.container._comm_pair_id, self.job_name, self.pf_file)
 
     def _sync(self):
         symbols = utils._get_symbol_names_from_gdx(
@@ -542,4 +547,21 @@ class NEOSServer(backend.Backend):
         options._set_extra_options(extra_options)
         options._export(self.pf_file)
 
-        self.container._send_job(self.job_name, self.pf_file)
+        send_job(self.container._comm_pair_id, self.job_name, self.pf_file)
+
+
+def _parse_solver_options(path: Path) -> dict[str, Any]:
+    """Parse solver options to a dict"""
+    solver_options = {}
+    with open(path) as file:
+        lines = file.readlines()
+
+    for line in lines:
+        if not line or line.startswith("*"):
+            continue
+
+        splitter = "=" if "=" in line else " "
+        key, value = line.split(splitter)
+        solver_options[key.strip()] = value
+
+    return solver_options

gamspy/_cli/install.py

@@ -7,6 +7,7 @@ import subprocess
 import sys
 from typing import TYPE_CHECKING, Annotated
 
+import certifi
 import requests
 import typer
 
@@ -133,11 +134,16 @@ def license(
             command.append("-o")
             command.append(license_path)
 
+        environment_variables = os.environ.copy()
+        if "CURL_CA_BUNDLE" not in environment_variables:
+            environment_variables["CURL_CA_BUNDLE"] = certifi.where()
+
         process = subprocess.run(
             command,
             text=True,
             capture_output=True,
             encoding="utf-8",
+            env=environment_variables,
         )
         if process.returncode:
             raise ValidationError(process.stderr)
@@ -218,6 +224,8 @@ def solver(
     install_all_solvers: bool = typer.Option(
         False,
         "--install-all-solvers",
+        "--all",
+        "-a",
         help="Installs all available add-on solvers.",
     ),
     existing_solvers: bool = typer.Option(
@@ -243,6 +251,9 @@ def solver(
 
     addons_path = os.path.join(utils.DEFAULT_DIR, "solvers.txt")
     os.makedirs(utils.DEFAULT_DIR, exist_ok=True)
+    environment_variables = os.environ.copy()
+    if "CURL_CA_BUNDLE" not in environment_variables:
+        environment_variables["CURL_CA_BUNDLE"] = certifi.where()
 
     def install_addons(addons: Iterable[str]):
         for item in addons:
@@ -270,8 +281,6 @@ def solver(
                     command = [
                         "uv",
                         "pip",
-                        "--python-preference",
-                        "only-system",
                         "install",
                         f"gamspy-{solver_name}=={solver_version}",
                         "--force-reinstall",
@@ -291,6 +300,7 @@ def solver(
                         check=True,
                         encoding="utf-8",
                         stderr=subprocess.PIPE,
+                        env=environment_variables,
                     )
                 except subprocess.CalledProcessError as e:
                     raise GamspyException(

gamspy/_cli/retrieve.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import os
 import subprocess
 
+import certifi
 import typer
 
 import gamspy.utils as utils
@@ -46,6 +47,10 @@ def license(
     if access_code is None:
         raise ValidationError(f"Given licence id `{access_code}` is not valid!")
 
+    environment_variables = os.environ.copy()
+    if "CURL_CA_BUNDLE" not in environment_variables:
+        environment_variables["CURL_CA_BUNDLE"] = certifi.where()
+
     gamspy_base_dir = utils._get_gamspy_base_directory()
     command = [
         os.path.join(gamspy_base_dir, "gamsgetkey"),
@@ -58,9 +63,7 @@ def license(
         command.append(str(checkout_duration))
 
     process = subprocess.run(
-        command,
-        text=True,
-        capture_output=True,
+        command, text=True, capture_output=True, env=environment_variables
     )
 
     if process.returncode:

gamspy/_cli/run.py

@@ -5,11 +5,12 @@ import platform
 import subprocess
 import sys
 from enum import Enum
-from typing import Annotated
+from pathlib import Path  # noqa: TC003
+from typing import Annotated, Optional
 
 import typer
 
-from gamspy.exceptions import GamspyException, ValidationError
+from gamspy.exceptions import ValidationError
 
 app = typer.Typer(
     rich_markup_mode="rich",
@@ -19,7 +20,7 @@ app = typer.Typer(
 )
 
 
-class ModeEnum(Enum):
+class ModeEnum(str, Enum):
     config = "config"
     base = "base"
     deploy = "deploy"
@@ -35,10 +36,11 @@ def miro(
         typer.Option("--mode", "-m", help="Execution mode of MIRO"),
     ] = ModeEnum.base,  # type: ignore
     path: Annotated[
-        str | None,
+        Optional[Path],  # noqa: UP045
         typer.Option(
             "--path",
             "-p",
+            exists=True,
             help="Path to the MIRO executable (.exe, .app, or .AppImage)",
         ),
     ] = None,
@@ -47,8 +49,8 @@ def miro(
         typer.Option("--skip-execution", help="Whether to skip model execution."),
     ] = False,
     model: Annotated[
-        str | None,
-        typer.Option("--model", "-g", help="Path to the GAMSPy model."),
+        Optional[Path],  # noqa: UP045,
+        typer.Option("--model", "-g", exists=True, help="Path to the GAMSPy model."),
     ] = None,
     args: Annotated[
         list[str] | None,
@@ -56,17 +58,18 @@ def miro(
     ] = None,
 ) -> None:
     if model is None:
-        raise ValidationError("--model must be provided to run MIRO")
+        typer.echo("--model must be provided to run MIRO", file=sys.stderr)
+        sys.exit(1)
 
     model = os.path.abspath(model)
     execution_mode = mode.value
-    path = os.getenv("MIRO_PATH", None)
+    path = os.getenv("MIRO_PATH", path)
 
     if path is None:
         path = path if path is not None else discover_miro()
 
     if path is None:
-        raise GamspyException("--path must be provided to run MIRO")
+        raise ValidationError("--path must be provided to run MIRO")
 
     if platform.system() == "Darwin" and os.path.splitext(path)[1] == ".app":
         path = os.path.join(path, "Contents", "MacOS", "GAMS MIRO")
@@ -79,10 +82,16 @@ def miro(
         if args is not None:
             command += args
 
-        try:
-            subprocess.run(command, env=subprocess_env, check=True)
-        except subprocess.CalledProcessError:
-            return
+        process = subprocess.run(
+            command,
+            env=subprocess_env,
+            capture_output=True,
+            text=True,
+            encoding="utf-8",
+        )
+        if process.returncode != 0:
+            typer.echo(process.stderr, file=sys.stderr)
+            sys.exit(process.returncode)
 
     # Run MIRO
     subprocess_env = os.environ.copy()

gamspy/_cli/uninstall.py

@@ -5,6 +5,7 @@ import subprocess
 import sys
 from typing import TYPE_CHECKING, Annotated
 
+import certifi
 import typer
 
 import gamspy.utils as utils
@@ -50,7 +51,11 @@ def solver(
         ),
     ] = None,
     uninstall_all_solvers: bool = typer.Option(
-        False, "--uninstall-all-solvers", help="Uninstalls all add-on solvers."
+        False,
+        "--uninstall-all-solvers",
+        "--all",
+        "-a",
+        help="Uninstalls all add-on solvers.",
     ),
     skip_pip_uninstall: bool = typer.Option(
         False,
@@ -70,6 +75,9 @@ def solver(
         ) from e
 
     addons_path = os.path.join(utils.DEFAULT_DIR, "solvers.txt")
+    environment_variables = os.environ.copy()
+    if "CURL_CA_BUNDLE" not in environment_variables:
+        environment_variables["CURL_CA_BUNDLE"] = certifi.where()
 
     def remove_addons(addons: Iterable[str]):
         for item in addons:
@@ -91,8 +99,6 @@ def solver(
                     command = [
                         "uv",
                         "pip",
-                        "--python-preference",
-                        "only-system",
                         "uninstall",
                         f"gamspy-{solver_name}",
                     ]
@@ -106,7 +112,12 @@ def solver(
                         "-y",
                     ]
                 try:
-                    _ = subprocess.run(command, check=True)
+                    _ = subprocess.run(
+                        command,
+                        check=True,
+                        encoding="utf-8",
+                        stderr=subprocess.PIPE,
+                    )
                 except subprocess.CalledProcessError as e:
                     raise GamspyException(
                         f"Could not uninstall gamspy-{solver_name}: {e.output}"

gamspy/_communication.py

@@ -0,0 +1,215 @@
+from __future__ import annotations
+
+import os
+import platform
+import signal
+import socket
+import subprocess
+import threading
+import time
+from typing import TYPE_CHECKING
+
+import certifi
+
+from gamspy import utils
+from gamspy.exceptions import FatalError, GamspyException, ValidationError
+
+if TYPE_CHECKING:
+    import io
+
+    from gamspy import Container
+
+
+_comm_pairs: dict[str, tuple[socket.socket, subprocess.Popen]] = {}
+
+
+def open_connection(container: Container) -> None:
+    LOOPBACK = "127.0.0.1"
+    TIMEOUT = 30
+
+    initial_pf_file = os.path.join(container._process_directory, "gamspy.pf")
+    with open(initial_pf_file, "w") as file:
+        file.write(
+            'incrementalMode="2"\n'
+            f'procdir="{container._process_directory}"\n'
+            f'license="{container._license_path}"\n'
+            f'curdir="{os.getcwd()}"\n'
+        )
+
+    command = [
+        os.path.join(container.system_directory, "gams"),
+        "GAMSPY_JOB",
+        "pf",
+        initial_pf_file,
+    ]
+
+    certificate_path = os.path.join(utils.DEFAULT_DIR, "gamspy_cert.crt")
+    env = os.environ.copy()
+    if os.path.isfile(certificate_path):
+        env["GAMSLICECRT"] = certificate_path
+
+    env = os.environ.copy()
+    if "CURL_CA_BUNDLE" not in env:
+        env["CURL_CA_BUNDLE"] = certifi.where()
+
+    process = subprocess.Popen(
+        command,
+        text=True,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        errors="replace",
+        start_new_session=platform.system() != "Windows",
+        env=env,
+    )
+
+    port_info = process.stdout.readline().strip()
+
+    try:
+        port = int(port_info.removeprefix("port: "))
+    except ValueError as e:
+        raise ValidationError(
+            f"Error while reading the port! {port_info + process.stdout.read()}"
+        ) from e
+
+    def handler(signum, frame):
+        if platform.system() != "Windows":
+            os.kill(process.pid, signal.SIGINT)
+
+    if threading.current_thread() is threading.main_thread():
+        signal.signal(signal.SIGINT, handler)
+
+    start = time.time()
+    while True:
+        if process.poll() is not None:  # pragma: no cover
+            raise ValidationError(process.communicate()[0])
+
+        try:
+            new_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            new_socket.connect((LOOPBACK, port))
+            break
+        except (ConnectionRefusedError, OSError) as e:
+            new_socket.close()
+            end = time.time()
+
+            if end - start > TIMEOUT:  # pragma: no cover
+                raise FatalError(
+                    f"Timeout while establishing the connection with socket. {process.communicate()[0]}"
+                ) from e
+
+    _comm_pairs[container._comm_pair_id] = (new_socket, process)
+
+
+def get_connection(pair_id: str) -> tuple[socket.socket, subprocess.Popen]:
+    return _comm_pairs[pair_id]
+
+
+def close_connection(pair_id: str):
+    try:
+        _socket, process = get_connection(pair_id)
+    except KeyError:
+        # This means that the connection is already closed.
+        return
+
+    _socket.sendall(b"stop")
+    _socket.close()
+
+    if not process.stdout.closed:
+        process.stdout.close()
+
+    # Wait until the GAMS process dies.
+    while process.poll() is None:
+        ...
+
+    del _comm_pairs[pair_id]
+
+
+def _read_output(process: subprocess.Popen, output: io.TextIOWrapper | None) -> None:
+    if output is not None:
+        while True:
+            data = process.stdout.readline()
+            output.write(data)
+            output.flush()
+            if data.startswith("--- Job ") and "elapsed" in data:
+                break
+
+
+def check_response(response: bytes, job_name: str) -> None:
+    GAMS_STATUS = {
+        1: "Solver is to be called, the system should never return this number.",
+        2: "There was a compilation error.",
+        3: "There was an execution error.",
+        4: "System limits were reached.",
+        5: "There was a file error.",
+        6: "There was a parameter error.",
+        7: "The solve has failed due to a license error. The license you are using may impose model size limits (demo/community license) or you are using a GAMSPy incompatible professional license. Please contact sales@gams.com to find out about license options.",
+        8: "There was a GAMS system error.",
+        9: "GAMS could not be started.",
+        10: "Out of memory.",
+        11: "Out of disk.",
+        109: "Could not create process/scratch directory.",
+        110: "Too many process/scratch directories.",
+        112: "Could not delete the process/scratch directory.",
+        113: "Could not write the script gamsnext.",
+        114: "Could not write the parameter file.",
+        115: "Could not read environment variable.",
+        400: "Could not spawn the GAMS language compiler (gamscmex).",
+        401: "Current directory (curdir) does not exist.",
+        402: "Cannot set current directory (curdir).",
+        404: "Blank in system directory (UNIX only).",
+        405: "Blank in current directory (UNIX only).",
+        406: "Blank in scratch extension (scrext)",
+        407: "Unexpected cmexRC.",
+        408: "Could not find the process directory (procdir).",
+        409: "CMEX library not be found (experimental).",
+        410: "Entry point in CMEX library could not be found (experimental).",
+        411: "Blank in process directory (UNIX only).",
+        412: "Blank in scratch directory (UNIX only).",
+        909: "Cannot add path / unknown UNIX environment / cannot set environment variable.",
+        1000: "Driver error: incorrect command line parameters for gams.",
+        2000: "Driver error: internal error: cannot install interrupt handler.",
+        3000: "Driver error: problems getting current directory.",
+        4000: "Driver error: internal error: GAMS compile and execute module not found.",
+        5000: "Driver error: internal error: cannot load option handling library.",
+    }
+
+    value = response[: response.find(b"#")].decode("ascii")
+    if not value:
+        raise FatalError(
+            "Error while getting the return code from GAMS backend. This means that GAMS is in a bad state. Try to backtrack for previous errors."
+        )
+
+    return_code = int(value)
+
+    if return_code in GAMS_STATUS:
+        try:
+            info = GAMS_STATUS[return_code]
+        except IndexError:  # pragma: no cover
+            info = ""
+
+        raise GamspyException(
+            f"Return code {return_code}. {info} Check {job_name + '.lst'} for more information.",
+            return_code,
+        )
+
+
+def send_job(
+    comm_pair_id: str,
+    job_name: str,
+    pf_file: str,
+    output: io.TextIOWrapper | None = None,
+):
+    _socket, process = get_connection(comm_pair_id)
+    try:
+        # Send pf file
+        _socket.sendall(pf_file.encode("utf-8"))
+
+        # Read output
+        _read_output(process, output)
+
+        # Receive response
+        response = _socket.recv(256)
+        check_response(response, job_name)
+    except ConnectionError as e:
+        raise FatalError(
+            f"There was an error while communicating with GAMS server: {e}",
+        ) from e

gamspy/_container.py

@@ -3,14 +3,14 @@ from __future__ import annotations
 import atexit
 import os
 import platform
+import shutil
 import signal
-import socket
-import subprocess
+import sys
 import tempfile
 import threading
-import time
 import traceback
 import weakref
+from pathlib import Path
 from typing import TYPE_CHECKING
 
 import gams.transfer as gt
@@ -20,12 +20,13 @@ import gamspy._miro as miro
 import gamspy._validation as validation
 import gamspy.utils as utils
 from gamspy._backend.backend import backend_factory
+from gamspy._communication import close_connection, get_connection, open_connection
 from gamspy._config import get_option
 from gamspy._extrinsic import ExtrinsicLibrary
 from gamspy._miro import MiroJSONEncoder
 from gamspy._model import Problem, Sense
 from gamspy._workspace import Workspace
-from gamspy.exceptions import FatalError, GamspyException, ValidationError
+from gamspy.exceptions import ValidationError
 
 if TYPE_CHECKING:
     import io
@@ -67,79 +68,6 @@ def add_sysdir_to_path(system_directory: str) -> None:
             os.environ["PATH"] = system_directory
 
 
-def open_connection(
-    system_directory: str, process_directory: str, license_path: str
-) -> tuple[socket.socket, subprocess.Popen]:
-    TIMEOUT = 30
-
-    initial_pf_file = os.path.join(process_directory, "gamspy.pf")
-    with open(initial_pf_file, "w") as file:
-        file.write(
-            'incrementalMode="2"\n'
-            f'procdir="{process_directory}"\n'
-            f'license="{license_path}"\n'
-            f'curdir="{os.getcwd()}"\n'
-        )
-
-    command = [
-        os.path.join(system_directory, "gams"),
-        "GAMSPY_JOB",
-        "pf",
-        initial_pf_file,
-    ]
-
-    certificate_path = os.path.join(utils.DEFAULT_DIR, "gamspy_cert.crt")
-    env = os.environ.copy()
-    if os.path.isfile(certificate_path):
-        env["GAMSLICECRT"] = certificate_path
-
-    process = subprocess.Popen(
-        command,
-        text=True,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT,
-        errors="replace",
-        start_new_session=platform.system() != "Windows",
-        env=env,
-    )
-
-    port_info = process.stdout.readline().strip()
-
-    try:
-        port = int(port_info.removeprefix("port: "))
-    except ValueError as e:
-        raise ValidationError(
-            f"Error while reading the port! {port_info + process.stdout.read()}"
-        ) from e
-
-    def handler(signum, frame):
-        if platform.system() != "Windows":
-            os.kill(process.pid, signal.SIGINT)
-
-    if threading.current_thread() is threading.main_thread():
-        signal.signal(signal.SIGINT, handler)
-
-    start = time.time()
-    while True:
-        if process.poll() is not None:  # pragma: no cover
-            raise ValidationError(process.communicate()[0])
-
-        try:
-            new_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            new_socket.connect((LOOPBACK, port))
-            break
-        except (ConnectionRefusedError, OSError) as e:
-            new_socket.close()
-            end = time.time()
-
-            if end - start > TIMEOUT:  # pragma: no cover
-                raise FatalError(
-                    f"Timeout while establishing the connection with socket. {process.communicate()[0]}"
-                ) from e
-
-    return new_socket, process
-
-
 def get_system_directory(system_directory: str | os.PathLike | None) -> str:
     if isinstance(system_directory, os.PathLike):
         system_directory = os.fspath(system_directory)
@@ -171,65 +99,6 @@ def get_options_file_name(solver: str, file_number: int) -> str:
     return options_file_name
 
 
-def check_response(response: bytes, job_name: str) -> None:
-    GAMS_STATUS = {
-        1: "Solver is to be called, the system should never return this number.",
-        2: "There was a compilation error.",
-        3: "There was an execution error.",
-        4: "System limits were reached.",
-        5: "There was a file error.",
-        6: "There was a parameter error.",
-        7: "The solve has failed due to a license error. The license you are using may impose model size limits (demo/community license) or you are using a GAMSPy incompatible professional license. Please contact sales@gams.com to find out about license options.",
-        8: "There was a GAMS system error.",
-        9: "GAMS could not be started.",
-        10: "Out of memory.",
-        11: "Out of disk.",
-        109: "Could not create process/scratch directory.",
-        110: "Too many process/scratch directories.",
-        112: "Could not delete the process/scratch directory.",
-        113: "Could not write the script gamsnext.",
-        114: "Could not write the parameter file.",
-        115: "Could not read environment variable.",
-        400: "Could not spawn the GAMS language compiler (gamscmex).",
-        401: "Current directory (curdir) does not exist.",
-        402: "Cannot set current directory (curdir).",
-        404: "Blank in system directory (UNIX only).",
-        405: "Blank in current directory (UNIX only).",
-        406: "Blank in scratch extension (scrext)",
-        407: "Unexpected cmexRC.",
-        408: "Could not find the process directory (procdir).",
-        409: "CMEX library not be found (experimental).",
-        410: "Entry point in CMEX library could not be found (experimental).",
-        411: "Blank in process directory (UNIX only).",
-        412: "Blank in scratch directory (UNIX only).",
-        909: "Cannot add path / unknown UNIX environment / cannot set environment variable.",
-        1000: "Driver error: incorrect command line parameters for gams.",
-        2000: "Driver error: internal error: cannot install interrupt handler.",
-        3000: "Driver error: problems getting current directory.",
-        4000: "Driver error: internal error: GAMS compile and execute module not found.",
-        5000: "Driver error: internal error: cannot load option handling library.",
-    }
-
-    value = response[: response.find(b"#")].decode("ascii")
-    if not value:
-        raise FatalError(
-            "Error while getting the return code from GAMS backend. This means that GAMS is in a bad state. Try to backtrack for previous errors."
-        )
-
-    return_code = int(value)
-
-    if return_code in GAMS_STATUS:
-        try:
-            info = GAMS_STATUS[return_code]
-        except IndexError:  # pragma: no cover
-            info = ""
-
-        raise GamspyException(
-            f"Return code {return_code}. {info} Check {job_name + '.lst'} for more information.",
-            return_code,
-        )
-
-
 class Container(gt.Container):
     """
     A container is an object that holds all symbols and operates on them.
@@ -266,14 +135,13 @@ class Container(gt.Container):
         options: Options | None = None,
         output: io.TextIOWrapper | None = None,
     ):
+        self._comm_pair_id = utils._get_unique_name()
         self.output = output
         self._gams_string = ""
         self.models: dict[str, Model] = {}
         if IS_MIRO_INIT:
             atexit.register(self._write_miro_files)
 
-        self._is_socket_open = True
-
         system_directory = get_system_directory(system_directory)
         add_sysdir_to_path(system_directory)
 
@@ -306,16 +174,8 @@ class Container(gt.Container):
         self._miro_input_symbols: list[str] = []
         self._miro_output_symbols: list[str] = []
 
-        self._socket, self._process = open_connection(
-            self.system_directory, self._process_directory, self._license_path
-        )
-        weakref.finalize(
-            self,
-            self._release_resources,
-            self._is_socket_open,
-            self._socket,
-            self._process,
-        )
+        open_connection(self)
+        weakref.finalize(self, close_connection, self._comm_pair_id)
 
         self._is_restarted = False
         if load_from is not None:
@@ -434,58 +294,12 @@ class Container(gt.Container):
 
         return name
 
-    @staticmethod
-    def _release_resources(
-        is_socket_open: bool, socket: socket.socket, process: subprocess.Popen
-    ):
-        if is_socket_open:
-            try:
-                socket.sendall(b"stop")
-                socket.close()
-
-                if not process.stdout.closed:
-                    process.stdout.close()
-
-                while process.poll() is None:
-                    ...
-            except OSError:  # Socket may have been already closed.
-                ...
-
-    def _read_output(self, output: io.TextIOWrapper | None) -> None:
-        if output is not None:
-            while True:
-                data = self._process.stdout.readline()
-                output.write(data)
-                output.flush()
-                if data.startswith("--- Job ") and "elapsed" in data:
-                    break
-
     def _interrupt(self) -> None:
+        _, process = get_connection(self._comm_pair_id)
         if platform.system() == "Windows":
-            os.kill(self._process.pid, signal.CTRL_C_EVENT)
+            os.kill(process.pid, signal.CTRL_C_EVENT)
         else:
-            os.kill(self._process.pid, signal.SIGINT)
-
-    def _send_job(
-        self,
-        job_name: str,
-        pf_file: str,
-        output: io.TextIOWrapper | None = None,
-    ):
-        try:
-            # Send pf file
-            self._socket.sendall(pf_file.encode("utf-8"))
-
-            # Read output
-            self._read_output(output)
-
-            # Receive response
-            response = self._socket.recv(256)
-            check_response(response, job_name)
-        except ConnectionError as e:
-            raise FatalError(
-                f"There was an error while communicating with GAMS server: {e}",
-            ) from e
+            os.kill(process.pid, signal.SIGINT)
 
     def _write_miro_files(self):
         # create conf_<model>/<model>_io.json
@@ -493,9 +307,8 @@ class Container(gt.Container):
             encoder = MiroJSONEncoder(self)
             encoder.write_json()
         except Exception:
-            self._release_resources(self._is_socket_open, self._socket, self._process)
-            self._is_socket_open = False
-            traceback.print_exc()
+            close_connection(self._comm_pair_id)
+            traceback.print_exc(file=sys.stderr)
             os._exit(1)
 
     def _add_statement(self, statement) -> None:
@@ -855,7 +668,7 @@ class Container(gt.Container):
         )
 
     def writeSolverOptions(
-        self, solver: str, solver_options: dict, file_number: int = 1
+        self, solver: str, solver_options: dict | str | Path, file_number: int = 1
     ) -> None:
         """
         Writes solver options of the specified solver to the working directory.
@@ -864,8 +677,8 @@ class Container(gt.Container):
         ----------
         solver : str
             Name of the solver.
-        solver_options : dict
-            Options of the specified solver.
+        solver_options : dict | str | Path
+            Options of the specified solver or path to an existing solver options file.
         file_number : int
             Solver option file number. Equivalent to optfile option of GAMS. See https://gams.com/latest/docs/UG_GamsCall.html#GAMSAOoptfile for more details.
 
@@ -881,17 +694,24 @@ class Container(gt.Container):
                 f"The smallest number `file_number` can get is 1 but received {file_number}"
             )
 
+        if solver.lower() == "conopt":
+            solver = "conopt4"
+
         options_file_name = os.path.join(
             self.working_directory, get_options_file_name(solver, file_number)
         )
 
-        with open(options_file_name, "w", encoding="utf-8") as solver_file:
-            for key, value in solver_options.items():
-                row = f"{key} {value}\n"
-                if solver.upper() in ("SHOT", "SOPLEX", "SCIP", "HIGHS"):
-                    row = f"{key} = {value}\n"
+        if isinstance(solver_options, (str, Path)):
+            path = Path(solver_options)
+            shutil.copy2(path, options_file_name)
+        else:
+            with open(options_file_name, "w", encoding="utf-8") as solver_file:
+                for key, value in solver_options.items():
+                    row = f"{key} {value}\n"
+                    if solver.upper() in ("SHOT", "SOPLEX", "SCIP", "HIGHS"):
+                        row = f"{key} = {value}\n"
 
-                solver_file.write(row)
+                    solver_file.write(row)
 
         # The following solvers do not use the opt<solver>.def file
         if solver.upper() in (
@@ -1026,8 +846,7 @@ class Container(gt.Container):
         to communicate with the GAMS execution engine, e.g. creating new symbols, changing data,
         solves, etc. The container data (Container.data) is still available for read operations.
         """
-        self._release_resources(self._is_socket_open, self._socket, self._process)
-        self._is_socket_open = False
+        close_connection(self._comm_pair_id)
 
     def addAlias(
         self,

gamspy/_convert.py

@@ -311,6 +311,8 @@ def get_convert_solver_options(
     FORMAT_RENAME_MAP = {
         "GDXJacobian": "DumpGDX",
         "GDXIntervalEval": "IntervalEval",
+        "GAMSDict": "Dict",
+        "GAMSDictMap": "DictMap",
     }
     OPTION_RENAME_MAP = {"GAMSInsert": "GmsInsert", "GAMSObjVar": "ObjVar"}
 

gamspy/_model.py

@@ -4,7 +4,6 @@ import inspect
 import logging
 import os
 import threading
-import warnings
 from collections.abc import Sequence
 from enum import Enum
 from pathlib import Path
@@ -31,14 +30,12 @@ from gamspy._options import (
     MODEL_ATTR_OPTION_MAP,
     ConvertOptions,
     FreezeOptions,
-    ModelInstanceOptions,
     Options,
 )
 from gamspy.exceptions import GamspyException, ValidationError
 
 if TYPE_CHECKING:
-    import io
-    from typing import Literal
+    from typing import Literal, TextIO
 
     import pandas as pd
 
@@ -1307,10 +1304,9 @@ class Model:
         self,
         solver: str | None = None,
         options: Options | None = None,
-        solver_options: dict | None = None,
-        model_instance_options: ModelInstanceOptions | None = None,
+        solver_options: dict | str | Path | None = None,
         freeze_options: FreezeOptions | None = None,
-        output: io.TextIOWrapper | None = None,
+        output: TextIO | None = None,
         backend: Literal["local", "engine", "neos"] = "local",
         client: EngineClient | NeosClient | None = None,
         load_symbols: list[Symbol] | None = None,
@@ -1324,14 +1320,12 @@ class Model:
             Solver name
         options : Options, optional
             GAMSPy options.
-        solver_options : dict, optional
-            Solver options.
-        model_instance_options : ModelInstanceOptions, optional
-            Options to solve a frozen model. This argument will be deprecated in GAMSPy 1.10.0. Please use freeze_options instead.
+        solver_options : dict | str | Path, optional
+            Dictionary of solver options or path to an existing option file.
         freeze_options : FreezeOptions, optional
             Options to solve a frozen model.
-        output : TextIOWrapper, optional
-            Output redirection target
+        output : TextIO, optional
+            Output redirection target. Set this to sys.stdout to see the output in your terminal.
         backend : str, optional
             Backend to run on
         client : EngineClient, NeosClient, optional
@@ -1395,21 +1389,20 @@ class Model:
         if options is None:
             options = self.container._options
 
+        if isinstance(solver_options, (str, Path)):
+            solver_options = Path(solver_options)
+
         # Only for local until GAMS Engine and NEOS Server backends adopt the new GP_SolveLine option.
         if backend == "local":
             frame = inspect.currentframe().f_back
             assert isinstance(options, gp.Options)
             options._frame = frame
 
+        if solver_options is not None:
+            self.container.writeSolverOptions(solver, solver_options)
+
         if self._is_frozen:
             instance_options = FreezeOptions()
-            if model_instance_options is not None:
-                warnings.warn(
-                    "model_instance_options will be renamed to freeze_options in GAMSPy 1.10.0",
-                    DeprecationWarning,
-                    stacklevel=2,
-                )
-                instance_options = model_instance_options
 
             if freeze_options is not None:
                 instance_options = freeze_options
@@ -1423,12 +1416,7 @@ class Model:
         self._add_runtime_options(options, backend)
         self.container._add_statement(self._generate_solve_string() + "\n")
         self._create_model_attributes()
-        options._set_solver_options(
-            container=self.container,
-            solver=solver,
-            problem=self.problem,
-            solver_options=solver_options,
-        )
+        options._set_model_info(solver, self.problem, solver_options)
 
         runner = backend_factory(
             self.container,

gamspy/_model_instance.py

@@ -59,6 +59,7 @@ from gams.core.gmo import (
 import gamspy as gp
 import gamspy._symbols.implicits as implicits
 import gamspy.utils as utils
+from gamspy._communication import send_job
 from gamspy._database import (
     Database,
     GamsEquation,
@@ -73,6 +74,7 @@ from gamspy.exceptions import (
 
 if TYPE_CHECKING:
     import io
+    from pathlib import Path
 
     from gamspy import Container, Model, Parameter
     from gamspy._options import FreezeOptions, Options
@@ -324,7 +326,9 @@ class ModelInstance:
         # Run
         try:
             self.container._job = self.job_name
-            self.container._send_job(self.job_name, self.pf_file, self.output)
+            send_job(
+                self.container._comm_pair_id, self.job_name, self.pf_file, self.output
+            )
         except GamspyException as exception:
             self.container._workspace._errors.append(str(exception))
             message = _customize_exception(
@@ -354,14 +358,11 @@ class ModelInstance:
         self,
         solver: str,
         instance_options: FreezeOptions,
-        solver_options: dict | None,
+        solver_options: dict | Path | None,
         output: io.TextIOWrapper | None,
     ) -> pd.DataFrame:
         # write solver options file
-        option_file = 0
-        if solver_options:
-            self.container.writeSolverOptions(solver, solver_options)
-            option_file = 1
+        option_file = 1 if solver_options else 0
 
         names_to_write = []
         for symbol in self.modifiables:

gamspy/_options.py

@@ -13,7 +13,6 @@ if TYPE_CHECKING:
     import io
     from types import FrameType
 
-    from gamspy import Container
     from gamspy._model import Problem
 
 SOLVE_LINK_MAP = {"disk": 2, "memory": 5}
@@ -482,19 +481,14 @@ class Options(BaseModel):
 
         return gams_options
 
-    def _set_solver_options(
-        self,
-        container: Container,
-        solver: str,
-        problem: Problem,
-        solver_options: dict | None,
+    def _set_model_info(
+        self, solver: str, problem: Problem, solver_options: dict | Path | None
     ):
         """Set the solver and the solver options"""
         self._solver = solver
         self._problem = str(problem)
 
         if solver_options:
-            container.writeSolverOptions(solver, solver_options)
             self._solver_options_file = "1"
         else:
             self._solver_options_file = "0"

gamspy/_symbols/alias.py

@@ -88,9 +88,6 @@ class Alias(gt.Alias, operable.Operable, Symbol, SetMixin):
                 f"Container must of type `Container` but found {type(container)}"
             )
 
-        if not isinstance(alias_with, (gp.Set, gp.Alias)):
-            raise TypeError(f"alias_with must be a Set but found {type(alias_with)}")
-
         if name is None:
             return object.__new__(cls)
         else:

gamspy/utils.py

@@ -492,11 +492,6 @@ def _get_license_path(system_directory: str) -> str:
     if os.path.exists(gamspy_license_path):
         return gamspy_license_path
 
-    # Check old license installation path.
-    user_license_path = os.path.join(system_directory, "user_license.txt")
-    if os.path.exists(user_license_path):
-        return user_license_path
-
     # No preinstalled licenses on the machine. Use the demo license.
     return os.path.join(system_directory, "gamslice.txt")
 

{gamspy-1.17.2.dist-info → gamspy-1.18.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gamspy
-Version: 1.17.2
+Version: 1.18.1
 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/
@@ -31,8 +31,8 @@ Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: gamsapi<52.0.0,>=51.1.0
-Requires-Dist: gamspy_base<52.0.0,>=51.1.0
+Requires-Dist: gamsapi<53.0.0,>=52.1.0
+Requires-Dist: gamspy_base<53.0.0,>=52.1.0
 Requires-Dist: pandas<2.4,>=2.2.2
 Requires-Dist: pydantic>=2.0
 Requires-Dist: requests>=2.28.0

{gamspy-1.17.2.dist-info → gamspy-1.18.1.dist-info}/RECORD

@@ -1,21 +1,22 @@
 gamspy/__init__.py,sha256=HZulKBgt2ubfX6r6v6Xv3MJVI6Prm40j5W45aUetQok,1797
 gamspy/__main__.py,sha256=3HW3NYEe4pZnGhJ10s1G0vaZAkI9Zl_lXqHT9iDNXQg,108
+gamspy/_communication.py,sha256=18drDsKxi1Iv6oAKZfKGJcPYYWebBQsyeOxiEKXZngE,7148
 gamspy/_config.py,sha256=n7RXUFczIlol15-mxhnj54fHXHet8HcOnWiGm3mpMgg,3589
-gamspy/_container.py,sha256=6dntB1rp0jl0a_JzJkCXPPqCuBTCmcOZmgePoht0QDY,52384
-gamspy/_convert.py,sha256=tnD-EJbffSUdWuo0TnlNOz_p6hGgVXT5m7kv8XFQtMQ,22232
+gamspy/_container.py,sha256=w5zftBCrgFSkZEOgwh2zyFjiDA4AohzNHi-BuF0Hjas,45884
+gamspy/_convert.py,sha256=z_ju0T2duAAeYE0ahW7E2GMdMMVZsQ5936HV583hXzs,22294
 gamspy/_database.py,sha256=SVo4lEfS0Q2f80uMu7k71BBQNRwUei-2KFc_EGxsOcw,6873
 gamspy/_extrinsic.py,sha256=6pBam_ruzKaYjEpALjAQ5d9uPrlOf1lVMYjRYqHH8o0,4337
 gamspy/_miro.py,sha256=MeFGcaFtNgtydWjH0KS0l9y3mNy7tPyXwm43jwomodg,12245
-gamspy/_model.py,sha256=9JqevkvCsMnZBjQsFQjOg167nN-3TuyHxvcB1xOea5U,51787
-gamspy/_model_instance.py,sha256=kVDKOMhLIcRPn5KYNnqWsfSGo5nhUyZimzylwrpYi6g,24361
-gamspy/_options.py,sha256=VFOdyMDp6K6kZ0ZWzWiwx3DAg0dSmMda7FFBAoMVSU4,27361
+gamspy/_model.py,sha256=Qd8JdDDUUSjWXQUKGR4N0-2J_PHnzh8sjSG3U7A4aKk,51359
+gamspy/_model_instance.py,sha256=ZHG3-inc6vDx7F2Oo9HYWYAi8hki6upIgAQn5II_o1U,24384
+gamspy/_options.py,sha256=FTty65WRdikvnhPyWSTuwuUz0Rs6aZwDFWL-UsfEgd0,27211
 gamspy/_serialization.py,sha256=fwAQpABCZQyxtAkddsvCDjtyQyPUT3EJy19r9BKR6aY,4062
 gamspy/_types.py,sha256=_KQjRntvIAicc9_sZ5BYWAHjs-WBURf2NJwTpJQT5xw,162
 gamspy/_validation.py,sha256=k4e8M8X32hEFybJyISyXLNrzO1mmWXQPnSThT7rOC5U,21608
 gamspy/_workspace.py,sha256=QrnC8aPN5C9zyqbaYvfuPlRHvBrDx_i4Imw1AzsJs7k,2175
 gamspy/exceptions.py,sha256=q-Cb6syXv1abf2JBfNFidGkvOWkp9FXU5NzJwkR5W7o,2929
 gamspy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gamspy/utils.py,sha256=3JgNFx4jyk9XTEcLzR513H7Ah5M-Lce2OsUPjyyRhnM,19971
+gamspy/utils.py,sha256=6eO4R0iBLRm2oTRCz_croiQhKpiIyF8bOa0NDfw9aUU,19777
 gamspy/version.py,sha256=GsqTw9rQ4Zz80ZSlIo44vYqgcVBJSbGOqJFJW3j_z88,109
 gamspy/_algebra/__init__.py,sha256=HdTHRBzfOGXihibQOAOAHGHKinlMuHVnpuP4pJWSQCc,479
 gamspy/_algebra/condition.py,sha256=mVJeCk65dvLgYalTQHfZt0bEFFf9yoTWLXjhODf7gvg,6229
@@ -25,23 +26,23 @@ gamspy/_algebra/number.py,sha256=Yf7kYLwkmXCipiAzQP7LtTchMMK7OccChuXnTIYl1w4,168
 gamspy/_algebra/operable.py,sha256=1sFr29_7A9RKVxDlTY9fC_g4sNRavNOYpjACWzvyjRc,6315
 gamspy/_algebra/operation.py,sha256=e3gYxS5OPh8JYGAnAS1wEpzafFpfBt0UbcL4PKZyoY0,22990
 gamspy/_backend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gamspy/_backend/backend.py,sha256=2tn9Oa-uJSBbXwOllrvc9zBl-EMEVRfsW8pqClkhOes,9174
-gamspy/_backend/engine.py,sha256=ajRKhJXs9f7_1oIhNJWZINQn0rlhphxXZBkG6nryfYw,31718
-gamspy/_backend/local.py,sha256=vZSC6GAn-xMe3h4Pl4c3HiCtwAgTcurNGYVZT3u4wAY,3681
-gamspy/_backend/neos.py,sha256=J78_AJ1527LRGVx43XWrykKBTVZWKyvrlZfN4PdaA0s,17089
+gamspy/_backend/backend.py,sha256=VgLL3CiFydkf1ZF8ttaOlWsDtkJIoRdi_md4tVh789Q,9217
+gamspy/_backend/engine.py,sha256=N3BIb4CDmH76CQIj87JSJBNnMLln3jsUuLy9_O5sEJ0,31826
+gamspy/_backend/local.py,sha256=-LE7obmZT3zdB-0LJHJ9xfulMBw5vvzFIS9WJ7ISE-4,3804
+gamspy/_backend/neos.py,sha256=I21TOqPZC5cBp_rQpz5S9cmLPRJcizIT0KuncwMcUrw,17762
 gamspy/_cli/__init__.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 gamspy/_cli/cli.py,sha256=a4AtD-VI5jk0ZcO0JAwD0f0KJRwmxA8MzR_2MmhPWpg,1580
 gamspy/_cli/gdx.py,sha256=YRu1delsmDh-dpzEr8n1kTK0JFdXlNqz4YuUQzK1mvo,12024
-gamspy/_cli/install.py,sha256=2t2QhcyKW3xICoastrYEzsEZs19_T7mHOq6uTb3n2J4,12862
+gamspy/_cli/install.py,sha256=Kr09kp146LujiO64GpoJxMPRZmY9GnhxuhWm-ZU2l4w,13257
 gamspy/_cli/list.py,sha256=fMmaIZcZf-Tf_-J37tJ4zrk2bcVO9cPSfs08mQyGWiY,2907
 gamspy/_cli/probe.py,sha256=K7fYwfdk-2mGGQKAxXFvkWMRJ1qYTUpX2tvklU56JZU,1122
-gamspy/_cli/retrieve.py,sha256=UjB0fvlxJ9s7RgiO3wD7fRpcFHGt0c7veLA-JKeTYSY,2254
-gamspy/_cli/run.py,sha256=iWvH8eiXzNempMMx-nlVIQpHOpUA6dot6XnZFI7ToWg,4076
+gamspy/_cli/retrieve.py,sha256=bnTcIbHJfkq-dvrFitdkxsjQNZz-Cx4-LiaRfhe0cYM,2446
+gamspy/_cli/run.py,sha256=oaWT4alxSXqPDF2mRYmfy5aOWCKoEExUfqYoAT_zSUM,4387
 gamspy/_cli/show.py,sha256=NTZJBtdns0Bd6UOdlTDIelhU92xmLJjT9HuDLqS3YJ4,11144
-gamspy/_cli/uninstall.py,sha256=k7IE3QVN_2vDkCcEB9JXEVMj7aM6DsUwG6-_oMJER7E,4879
+gamspy/_cli/uninstall.py,sha256=_g3SbT6G7DZcYgtmHLhaGl1B9jY1K3D0sStifxIyqxQ,5183
 gamspy/_cli/util.py,sha256=ey3Wn7tCEggkr-sjcLqrVBda-jdadjWOn-APhSe4toE,2849
 gamspy/_symbols/__init__.py,sha256=p0Zd7XytuOe8kRclN1lFrRFaN_btFSSGdIBSXrlp03E,450
-gamspy/_symbols/alias.py,sha256=_7dldyfwORBAvC1yEia6Dabe3lsERyW01tARlgFKLWc,8941
+gamspy/_symbols/alias.py,sha256=lIoNynvLd-tfXrVBs8Asy0TEkhs-xkTeNl4yLtzehiA,8795
 gamspy/_symbols/equation.py,sha256=W_8eQdZ9Mou9YVI1l0X_gwFB--TVNOK02OGpWmO3Xek,39719
 gamspy/_symbols/parameter.py,sha256=i5UWz8KQEHDBOjGV7JmL8GhnLnL-CiFMUhfSrBZOqQs,19721
 gamspy/_symbols/set.py,sha256=j3Izvgs470xiauwCbgXZOelZy-KAzslDGXuKeHn_g3g,29130
@@ -80,9 +81,9 @@ gamspy/math/matrix.py,sha256=PmYsMhF8Pq3bcgtyINryq4xV36i4KW0BtcFApOvt8GQ,16365
 gamspy/math/misc.py,sha256=FaSRYFjMN6AULqOqGIF6_AXDw6KVqgxm2EtZsDcBFmE,37432
 gamspy/math/probability.py,sha256=gAVU_PTfbjXuN6i8XNjZpIYvFg8dPk1imZCbKQloSG0,4290
 gamspy/math/trigonometric.py,sha256=VBWQcP3ggl1oGDEzRs2M_T88HPJn9N0QfMJZwEUkx4w,4276
-gamspy-1.17.2.dist-info/licenses/LICENSE,sha256=D4HfHbHRs3LVWo3uXq44WQc1FkBP5srUCEa-vO0W9tE,1189
-gamspy-1.17.2.dist-info/METADATA,sha256=zdPLlDz6jBgk76rAJMWDQuips72scwv450wLgcAj17Y,5301
-gamspy-1.17.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gamspy-1.17.2.dist-info/entry_points.txt,sha256=tzgC7L0Y_BiyagBCaYOPK7lE4olRJKM_PH2inmMvj60,48
-gamspy-1.17.2.dist-info/top_level.txt,sha256=fsq4q5lfdb2GEZC9O3PUih38s7TfIgolIaO5NgR3Hf8,7
-gamspy-1.17.2.dist-info/RECORD,,
+gamspy-1.18.1.dist-info/licenses/LICENSE,sha256=D4HfHbHRs3LVWo3uXq44WQc1FkBP5srUCEa-vO0W9tE,1189
+gamspy-1.18.1.dist-info/METADATA,sha256=E7-RHCJZIutvTFYwaNd7NtgGD35BKwa-RV-IBFyoG5Y,5301
+gamspy-1.18.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gamspy-1.18.1.dist-info/entry_points.txt,sha256=tzgC7L0Y_BiyagBCaYOPK7lE4olRJKM_PH2inmMvj60,48
+gamspy-1.18.1.dist-info/top_level.txt,sha256=fsq4q5lfdb2GEZC9O3PUih38s7TfIgolIaO5NgR3Hf8,7
+gamspy-1.18.1.dist-info/RECORD,,