salabim 24.0.17__tar.gz → 25.0.0__tar.gz

{salabim-24.0.17 → salabim-25.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: salabim
-Version: 24.0.17
+Version: 25.0.0
 Summary: salabim - discrete event simulation in Python
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://salabim.org

{salabim-24.0.17 → salabim-25.0.0}/pyproject.toml

@@ -1,30 +1,36 @@
-[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "salabim"
-authors = [
-    {name = "Ruud van der Ham", email = "rt.van.der.ham@gmail.com"}
-]
-description = "salabim - discrete event simulation in Python"
-version = "24.0.17"
-readme = "README.md"
-requires-python = ">=3.7"
-dependencies = [
-]
-classifiers = [
-  "Development Status :: 5 - Production/Stable",
-  "License :: OSI Approved :: MIT License",
-  "Programming Language :: Python :: 3 :: Only"
-]
-[project.urls]
-Homepage = "https://salabim.org"
-Repository = "https://github.com/salabim/salabim"
-
-
-[tool.setuptools]
-packages = ["salabim"]
-
-[tool.setuptools.package-data]
-"*" = ["*.ttf", "*.txt"]
+[build-system]
+requires = [
+    "setuptools",
+]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "salabim"
+authors = [
+    { name = "Ruud van der Ham", email = "rt.van.der.ham@gmail.com" },
+]
+description = "salabim - discrete event simulation in Python"
+version = "25.0.0"
+readme = "README.md"
+requires-python = ">=3.7"
+dependencies = []
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3 :: Only",
+]
+
+[project.urls]
+Homepage = "https://salabim.org"
+Repository = "https://github.com/salabim/salabim"
+
+[tool.setuptools]
+packages = [
+    "salabim",
+]
+
+[tool.setuptools.package-data]
+"*" = [
+    "*.ttf",
+    "*.txt",
+]

{salabim-24.0.17 → salabim-25.0.0}/salabim/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (C) 2017-2024 Ruud van der Ham, ruud@salabim.org
+Copyright (C) 2017-2025 Ruud van der Ham, ruud@salabim.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

{salabim-24.0.17 → salabim-25.0.0}/salabim/salabim.py

@@ -1,14 +1,13 @@
-#               _         _      _               ____   _  _        ___      _  _____
-#   ___   __ _ | |  __ _ | |__  (_) _ __ ___    |___ \ | || |      / _ \    / ||___  |
-#  / __| / _` || | / _` || '_ \ | || '_ ` _ \     __) || || |_    | | | |   | |   / /
-#  \__ \| (_| || || (_| || |_) || || | | | | |   / __/ |__   _| _ | |_| | _ | |  / /
-#  |___/ \__,_||_| \__,_||_.__/ |_||_| |_| |_|  |_____|   |_|  (_) \___/ (_)|_| /_/
+#               _         _      _               ____   ____       ___       ___
+#   ___   __ _ | |  __ _ | |__  (_) _ __ ___    |___ \ | ___|     / _ \     / _ \
+#  / __| / _` || | / _` || '_ \ | || '_ ` _ \     __) ||___ \    | | | |   | | | |
+#  \__ \| (_| || || (_| || |_) || || | | | | |   / __/  ___) | _ | |_| | _ | |_| |
+#  |___/ \__,_||_| \__,_||_.__/ |_||_| |_| |_|  |_____||____/ (_) \___/ (_) \___/
 #                    discrete event simulation
 #
 #  see www.salabim.org for more information, the documentation and license information
 
-__version__ = "24.0.17"
-
+__version__ = "25.0.0"
 import heapq
 import random
 import time
@@ -31,7 +30,6 @@ import subprocess
 import tempfile
 import struct
 import binascii
-import operator
 import copy
 import numbers
 import platform
@@ -43,8 +41,12 @@ import urllib.request
 import urllib.error
 import base64
 import zipfile
-
 from pathlib import Path
+try:
+    import peek
+except ModuleNotFoundError:
+    ...
+    
 
 from typing import Any, Union, Iterable, Tuple, List, Callable, TextIO, Dict, Set, Type, Hashable, Optional
 
@@ -62,6 +64,46 @@ Chromebook = "penguin" in platform.uname()
 PythonInExcel = not ("__file__" in globals())
 AnacondaCode = sys.platform == "emscripten"
 
+_color_name_to_ANSI = dict(
+    dark_black="\033[0;30m",
+    dark_red="\033[0;31m",
+    dark_green="\033[0;32m",
+    dark_yellow="\033[0;33m",
+    dark_blue="\033[0;34m",
+    dark_magenta="\033[0;35m",
+    dark_cyan="\033[0;36m",
+    dark_white="\033[0;37m",
+    black="\033[1;30m",
+    red="\033[1;31m",
+    green="\033[1;32m",
+    yellow="\033[1;33m",
+    blue="\033[1;34m",
+    magenta="\033[1;35m",
+    cyan="\033[1;36m",
+    white="\033[1;37m",
+    reset="\033[0m",
+)
+_ANSI_to_rgb = {
+    "\033[1;30m": (51, 51, 51),
+    "\033[1;31m": (255, 0, 0),
+    "\033[1;32m": (0, 255, 0),
+    "\033[1;33m": (255, 255, 0),
+    "\033[1;34m": (0, 178, 255),
+    "\033[1;35m": (255, 0, 255),
+    "\033[1;36m": (0, 255, 255),
+    "\033[1;37m": (255, 255, 255),
+    "\033[0;30m": (76, 76, 76),
+    "\033[0;31m": (178, 0, 0),
+    "\033[0;32m": (0, 178, 0),
+    "\033[0;33m": (178, 178, 0),
+    "\033[0;34m": (0, 89, 255),
+    "\033[0;35m": (178, 0, 178),
+    "\033[0;36m": (0, 178, 178),
+    "\033[0;37m": (178, 178, 178),
+    "\033[0m": (),
+}
+
+ANSI=types.SimpleNamespace(_color_name_to_ANSI.items())
 
 def a_log(*args):
     if not hasattr(a_log, "a_logfile_name"):
@@ -4867,7 +4909,7 @@ class Queue:
         """
         return getattr(self, "_sequence_number", 1)
 
-    def add(self, component: "Component") -> "Queue":
+    def add(self, component: "Component", priority: float = None) -> "Queue":
         """
         adds a component to the tail of a queue
 
@@ -4878,18 +4920,23 @@ class Queue:
 
             may not be member of the queue yet
 
+        priority : float
+            if None (default), add to the tail of the queue
+
+            otherwise, put after the last component with the same priority
+
         Note
         ----
-        the priority will be set to
+        if prioority is None, the priority will be set to
         the priority of the tail of the queue, if any
         or 0 if queue is empty
 
         This method is equivalent to append()
         """
-        component.enter(self)
+        component.enter(self, priority)
         return self
 
-    def append(self, component: "Component") -> "Queue":
+    def append(self, component: "Component", priority: float = None) -> "Queue":
         """
         appends a component to the tail of a queue
 
@@ -4900,9 +4947,14 @@ class Queue:
 
             may not be member of the queue yet
 
+        priority : float
+            if None (default), add to the tail of the queue
+
+            otherwise, put after the last component with the same priority
+
         Note
         ----
-        the priority will be set to
+        if priority is None, the priority will be set to
         the priority of the tail of the queue, if any
         or 0 if queue is empty
 
@@ -5014,7 +5066,7 @@ class Queue:
         component.enter_behind(self, poscomponent)
         return self
 
-    def add_sorted(self, component: "Component", priority: Any) -> "Queue":
+    def add_sorted(self, component: "Component", priority: float) -> "Queue":
         """
         adds a component to a queue, according to the priority
 
@@ -5025,7 +5077,7 @@ class Queue:
 
             may not be member of the queue yet
 
-        priority: type that can be compared with other priorities in the queue
+        priority: float
             priority in the queue
 
         Note
@@ -7317,6 +7369,29 @@ by adding at the end:
     def __repr__(self):
         return object_to_str(self) + " (" + self.name() + ")"
 
+    def reset_monitors(self, monitor: bool = None, stats_only: bool = None) -> None:
+        """
+        resets the monitor for the component's status and mode monitors
+
+        Parameters
+        ----------
+        monitor : bool
+            if True, monitoring will be on.
+
+            if False, monitoring is disabled
+
+            if omitted, no change of monitoring state
+
+        stats_only : bool
+            if True, only statistics will be collected (using less memory, but also less functionality)
+
+            if False, full functionality
+
+            if omittted, no change of stats_only
+        """
+        self.status.reset(monitor=monitor, stats_only=stats_only)
+        self.mode.reset(monitor=monitor, stats_only=stats_only)
+
     def register(self, registry: List) -> "Component":
         """
         registers the component in the registry
@@ -8050,6 +8125,7 @@ by adding:
         self,
         store: Union["Store", Iterable],
         filter: Callable = lambda c: True,
+        request_priority: Any = 0,
         fail_priority: float = 0,
         urgent: bool = True,
         fail_at: float = None,
@@ -8073,6 +8149,9 @@ by adding:
 
             default: lambda c: True (i.e. always return True)
 
+        request_priority: float
+            put component in to_store_requesters according to the given priority (default 0)
+
         fail_priority : float
             priority of the fail event
 
@@ -8213,7 +8292,7 @@ by adding:
 
         self._from_stores = from_stores
         for store in from_stores:
-            self.enter(store._from_store_requesters)
+            self.enter_sorted(store._from_store_requesters, priority=request_priority)
         self.status._value = requesting
         self._from_store_item = None
         self._from_store_filter = filter
@@ -8226,6 +8305,7 @@ by adding:
         self,
         store: Union["Store", Iterable],
         item: "Component",
+        request_priority: float = None,
         priority: float = 0,
         fail_priority: float = 0,
         urgent: bool = True,
@@ -8245,6 +8325,9 @@ by adding:
         item: Component
             component to put to store
 
+        request_priority: float
+            put component in to_store_requesters according to the given priority (default 0)
+
         fail_priority : float
             priority of the fail event
 
@@ -8256,11 +8339,11 @@ by adding:
         urgent : bool
             urgency indicator
 
-            if False (default), the component will be scheduled
+            if False (default), the fail event will be scheduled
             behind all other components scheduled
             for the same time and priority
 
-            if True, the component will be scheduled
+            if True, the fail event will be scheduled
             in front of all components scheduled
             for the same time and priority
 
@@ -8358,7 +8441,7 @@ by adding:
                 return
 
         for store in to_stores:
-            self.enter(store._to_store_requesters)
+            self.enter_sorted(store._to_store_requesters, priority=request_priority)
         self.status._value = requesting
         self._to_store_item = item
         self._to_store_priority = priority
@@ -8384,7 +8467,19 @@ by adding:
         for store in self._from_stores:
             store.rescan()
 
-    def request(self, *args, **kwargs) -> None:
+    def request(
+        self,
+        *args,
+        fail_at: float = None,
+        fail_delay: float = None,
+        mode: Any = None,
+        urgent: bool = False,
+        request_priority: float = 0,
+        schedule_priority: float = 0,
+        cap_now: bool = None,
+        oneof: bool = False,
+        called_from: str = "request",
+    ) -> None:
         """
         request from a resource or resources
 
@@ -8394,9 +8489,12 @@ by adding:
             - resource, where quantity=1, priority=tail of requesters queue
             - tuples/list containing a resource, a quantity and optionally a priority.
                 if the priority is not specified, the request
-                for the resource be added to the tail of
-                the requesters queue
+                for the resource will be added according to the request_priority parameter
+
+        request_priority: float
+            (may be overridden by the priority parameter in the arg sequence)
 
+            put component requesters according to the given priority (default 0)
 
         priority : float
             priority of the fail event
@@ -8499,17 +8597,7 @@ by adding:
         --> requests 1 from r1, r2 or r3
 
         """
-        fail_at = kwargs.pop("fail_at", None)
-        fail_delay = kwargs.pop("fail_delay", None)
-        mode = kwargs.pop("mode", None)
-        urgent = kwargs.pop("urgent", False)
-        schedule_priority = kwargs.pop("priority", 0)
-        cap_now = kwargs.pop("cap_now", None)
-        oneof = kwargs.pop("oneof", False)
-        called_from = kwargs.pop("called_from", "request")
         self.oneof_request = oneof
-        if kwargs:
-            raise TypeError(called_from + "() got an unexpected keyword argument '" + tuple(kwargs)[0] + "'")
 
         if self.status.value != current:
             self._checkisnotdata()
@@ -8542,7 +8630,7 @@ by adding:
             return
         for arg in args:
             q = 1
-            priority = inf
+            priority = request_priority
             if isinstance(arg, Resource):
                 r = arg
             elif isinstance(arg, (tuple, list)):
@@ -8580,7 +8668,7 @@ by adding:
             if self.oneof_request:
                 addstring += " (oneof)"
 
-            self.enter_sorted(r._requesters, priority)
+            self.enter(r._requesters, priority)
             if self.env._trace:
                 self.env.print_trace("", "", self.name(), req_text + r.name() + addstring)
 
@@ -8829,7 +8917,144 @@ by adding:
             for r in list(self._claims):
                 self._release(r)
 
-    def wait(self, *args, **kwargs) -> None:
+    def wait_for(self, cond, states, request_priority=0, priority=0, urgent=False, mode=None, fail_delay=None, fail_at=None, cap_now=None):
+        schedule_priority = priority
+        """
+        wait for any or all of the given state values are met
+
+        Parameters
+        ----------
+        cond : callable
+            parameterless function that return True if wait is over
+
+        states : iterable
+            specicies which states should trigger the cond to be checked
+
+        request_priority : float
+            put component in waiters queue according to the given priority (deafult 0)
+
+        priority : float
+            priority of the fail event
+
+            default: 0
+
+            if a component has the same time on the event list, this component is sorted accoring to
+            the priority.
+
+        urgent : bool
+            urgency indicator
+
+            if False (default), the component will be scheduled
+            behind all other components scheduled
+            for the same time and priority
+
+            if True, the component will be scheduled
+            in front of all components scheduled
+            for the same time and priority
+
+        fail_at : float or distribution
+            time out
+
+            if the wait is not honored before fail_at,
+            the wait will be cancelled and the
+            parameter failed will be set.
+
+            if not specified, the wait will not time out.
+
+            if distribution, the distribution is sampled
+
+        fail_delay : float or distribution
+            time out
+
+            if the wait is not honored before now+fail_delay,
+            the request will be cancelled and the
+            parameter failed will be set.
+
+            if not specified, the wait will not time out.
+
+            if distribution, the distribution is sampled
+
+        mode : str preferred
+            mode
+
+            will be used in trace and can be used in animations
+
+            if nothing specified, the mode will be unchanged.
+
+            also mode_time will be set to now, if mode is set.
+
+        cap_now : bool
+            indicator whether times (fail_at, fail_duration) in the past are allowed. If, so now() will be used.
+            default: sys.default_cap_now(), usualy False
+
+        Note
+        ----
+        Not allowed for data components or main.
+
+        Only if yieldless is False: If to be used for the current component
+        (which will be nearly always the case),
+        use ``yield self.wait(...)``.
+
+        """
+        if self.status.value != current:
+            self._checkisnotdata()
+            self._checkisnotmain()
+            self._remove()
+            self._check_fail()
+
+        self._failed = False
+
+        if fail_at is None:
+            if fail_delay is None:
+                scheduled_time = inf
+            else:
+                if fail_delay == inf:
+                    scheduled_time = inf
+                else:
+                    fail_delay = self.env.spec_to_duration(fail_delay)
+                    scheduled_time = self.env._now + fail_delay
+        else:
+            if fail_delay is None:
+                fail_at = self.env.spec_to_time(fail_at)
+                scheduled_time = fail_at + self.env._offset
+            else:
+                raise ValueError("both fail_at and fail_delay specified")
+
+        self.set_mode(mode)
+
+        self._cond = cond  # add test ***
+        for state in states:
+            self._waits.append((state, None, None))
+            if priority is None:
+                self.enter(state._waiters)
+            else:
+                self.enter_sorted(state._waiters, priority)
+
+        if not self._waits:
+            raise TypeError("no states specified")
+
+        self._remaining_duration = scheduled_time - self.env._now
+
+        self._trywait()
+
+        if self._waits:
+            self.status._value = waiting
+            self._reschedule(scheduled_time, schedule_priority, urgent, "wait_for", cap_now)
+        else:
+            return
+
+    def wait(
+        self,
+        *args,
+        fail_at: float = None,
+        fail_delay: float = None,
+        all: bool = False,
+        mode: Any = None,
+        urgent: bool = False,
+        request_priority: float = 0,
+        schedule_priority: float = 0,
+        cap_now: bool = None,
+    ) -> None:
         """
         wait for any or all of the given state values are met
 
@@ -8845,6 +9070,8 @@ by adding:
                 be added to the tail of
                 the waiters queue
 
+        request_priority : float
+            put component in waiters queue according to the given priority (default 0)
 
         priority : float
             priority of the fail event
@@ -8970,16 +9197,7 @@ by adding:
         --> waits for s1.value()==True and s2.value==True
 
         """
-        fail_at = kwargs.pop("fail_at", None)
-        fail_delay = kwargs.pop("fail_delay", None)
-        all = kwargs.pop("all", False)
-        mode = kwargs.pop("mode", None)
-        urgent = kwargs.pop("urgent", False)
-        schedule_priority = kwargs.pop("priority", 0)
-        cap_now = kwargs.pop("cap_now", None)
-
-        if kwargs:
-            raise TypeError("wait() got an unexpected keyword argument '" + tuple(kwargs)[0] + "'")
+        self._cond = None
 
         if self.status.value != current:
             self._checkisnotdata()
@@ -9010,7 +9228,7 @@ by adding:
 
         for arg in args:
             value = True
-            priority = None
+            priority = request_priority
             if isinstance(arg, State):
                 state = arg
             elif isinstance(arg, (tuple, list)):
@@ -9018,10 +9236,8 @@ by adding:
                 if not isinstance(state, State):
                     raise TypeError("incorrect specifier", arg)
                 if len(arg) >= 2:
-                    value = arg[1]
+                    priority = arg[1]
                 if len(arg) >= 3:
-                    priority = arg[2]
-                if len(arg) >= 4:
                     raise TypeError("incorrect specifier", arg)
             else:
                 raise TypeError("incorrect specifier", arg)
@@ -9057,37 +9273,40 @@ by adding:
     def _trywait(self):
         if self.status.value == interrupted:
             return False
-        if self._wait_all:
-            honored = True
-            for state, value, valuetype in self._waits:
-                if valuetype == 0:
-                    if value != state._value:
-                        honored = False
-                        break
-                elif valuetype == 1:
-                    if not eval(value.replace("$", "state._value")):
-                        honored = False
-                        break
-                elif valuetype == 2:
-                    if not value(state._value, self, state):
-                        honored = False
-                        break
-
+        if self._cond:
+            honored = self._cond()
         else:
-            honored = False
-            for state, value, valuetype in self._waits:
-                if valuetype == 0:
-                    if value == state._value:
-                        honored = True
-                        break
-                elif valuetype == 1:
-                    if eval(value.replace("$", str(state._value))):
-                        honored = True
-                        break
-                elif valuetype == 2:
-                    if value(state._value, self, state):
-                        honored = True
-                        break
+            if self._wait_all:
+                honored = True
+                for state, value, valuetype in self._waits:
+                    if valuetype == 0:
+                        if value != state._value:
+                            honored = False
+                            break
+                    elif valuetype == 1:
+                        if not eval(value.replace("$", "state._value")):
+                            honored = False
+                            break
+                    elif valuetype == 2:
+                        if not value(state._value, self, state):
+                            honored = False
+                            break
+
+            else:
+                honored = False
+                for state, value, valuetype in self._waits:
+                    if valuetype == 0:
+                        if value == state._value:
+                            honored = True
+                            break
+                    elif valuetype == 1:
+                        if eval(value.replace("$", str(state._value))):
+                            honored = True
+                            break
+                    elif valuetype == 2:
+                        if value(state._value, self, state):
+                            honored = True
+                            break
 
         if honored:
             for s, _, _ in self._waits:
@@ -9446,7 +9665,7 @@ by adding:
                 index += 1
             return index
 
-    def enter(self, q: "Queue") -> "Component":
+    def enter(self, q: "Queue", priority: float = None) -> "Component":
         """
         enters a queue at the tail
 
@@ -9462,8 +9681,17 @@ by adding:
         or 0 if queue is empty
         """
         self._checknotinqueue(q)
-        priority = q._tail.predecessor.priority
-        Qmember().insert_in_front_of(q._tail, self, q, priority)
+        if priority is None:
+            priority = q._tail.predecessor.priority
+            Qmember().insert_in_front_of(q._tail, self, q, priority)
+        else:
+            if q._length >= 1 and priority < q._head.successor.priority:  # direct enter component that's smaller than the rest
+                m2 = q._head.successor
+            else:
+                m2 = q._tail
+                while (m2.predecessor != q._head) and (m2.predecessor.priority > priority):
+                    m2 = m2.predecessor
+            Qmember().insert_in_front_of(m2, self, q, priority)
         return self
 
     def enter_at_head(self, q: "Queue") -> "Component":
@@ -9542,22 +9770,14 @@ by adding:
         q : Queue
             queue to enter
 
-        priority: type that can be compared with other priorities in the queue
+        priority: float
             priority in the queue
 
         Note
         ----
         The component is placed just before the first component with a priority > given priority
         """
-        self._checknotinqueue(q)
-        if q._length >= 1 and priority < q._head.successor.priority:  # direct enter component that's smaller than the rest
-            m2 = q._head.successor
-        else:
-            m2 = q._tail
-            while (m2.predecessor != q._head) and (m2.predecessor.priority > priority):
-                m2 = m2.predecessor
-        Qmember().insert_in_front_of(m2, self, q, priority)
-        return self
+        return self.enter(q, priority)
 
     def leave(self, q: "Queue" = None) -> "Component":
         """
@@ -9623,7 +9843,7 @@ by adding:
         q : Queue
             queue where the component belongs to
 
-        priority : type that can be compared with other priorities in the queue
+        priority : float
             priority in queue
 
             if omitted, no change
@@ -10765,8 +10985,8 @@ class Environment:
         s = "view("
         items = []
         for prop in props.split():
-            items.append(f"{getattr(self.view,prop)(t):.4f}")
-        print("view(" + (",".join(f"{prop}={getattr(self.view,prop)(t):.4f}" for prop in props.split())) + f")  # t={t:.4f}")
+            items.append(f"{getattr(self.view, prop)(t):.4f}")
+        print("view(" + (",".join(f"{prop}={getattr(self.view, prop)(t):.4f}" for prop in props.split())) + f")  # t={t:.4f}")
 
     def _bind(self, tkinter_event, func):
         self.root.bind(tkinter_event, func)
@@ -10882,7 +11102,7 @@ class Environment:
             ao.label = "fovy" if prop == "field_of_view_y" else prop
 
             ao = AnimateText(
-                text=lambda arg, t: f"{getattr(self.view,arg.prop)(t):11.3f}",
+                text=lambda arg, t: f"{getattr(self.view, arg.prop)(t):11.3f}",
                 x=5 + i * 80 + 70,
                 y=top,
                 font="calibri",
@@ -11724,7 +11944,7 @@ class Environment:
                                     format="GIF",
                                 )
                         else:
-                            for _ in range(2): # normally runs only once
+                            for _ in range(2):  # normally runs only once
                                 try:
                                     self._images[0].save(
                                         self._video_name,
@@ -11736,7 +11956,7 @@ class Environment:
                                     )
                                     break
                                 except ValueError:  # prevent bug in Python 3.13
-                                    self._images=[image.convert("RGB") for image in self._images]
+                                    self._images = [image.convert("RGB") for image in self._images]
 
                     else:
                         if PythonInExcel or AnacondaCode:
@@ -11752,9 +11972,8 @@ class Environment:
                                     format="GIF",
                                 )
                         else:
-                            for _ in range(2): # normally runs only once
+                            for _ in range(2):  # normally runs only once
                                 try:
-
                                     self._images[0].save(
                                         self._video_name,
                                         disposal=2,
@@ -11765,7 +11984,7 @@ class Environment:
                                         optimize=False,
                                     )
                                 except ValueError:  # prevent bug in Python 3.13
-                                    self._images=[image.convert("RGB") for image in self._images]
+                                    self._images = [image.convert("RGB") for image in self._images]
 
                     del self._images
             elif self._video_out == "png":
@@ -11829,7 +12048,6 @@ class Environment:
             Number of 1/30 second long frames to be inserted
         """
 
-
         if self._video_out is None:
             raise ValueError("video not set")
         if isinstance(image, (Path, str)):
@@ -11855,7 +12073,6 @@ class Environment:
                 open_cv_image = cv2.cvtColor(numpy.array(image), cv2.COLOR_RGB2BGR)
                 self._video_out.write(open_cv_image)
 
-
     def _save_frame(self):
         self._exclude_from_animation = "not in video"
         image = self._capture_image("RGBA", self._video_mode)
@@ -12790,7 +13007,7 @@ class Environment:
             self.animation_parameters(synced=value, animate=None)
         return self._synced
 
-    def minimized(self, value: bool=None)-> bool:
+    def minimized(self, value: bool = None) -> bool:
         """
         minimized
 
@@ -13058,7 +13275,7 @@ class Environment:
         """
         return self._current_component
 
-    def run(self, duration: float = None, till: float = None, priority: Any = inf, urgent: bool = False, cap_now: bool = None):
+    def run(self, duration: float = None, till: float = None, priority: float = inf, urgent: bool = False, cap_now: bool = None):
         """
         start execution of the simulation
 
@@ -13198,7 +13415,6 @@ class Environment:
                         self._t = self.animation_start_time
                     else:
                         self._t = self.animation_start_time + ((time.time() - self.animation_start_clocktime) * self._speed)
-
                 while self.peek() < self._t:
                     self.step()
                     if not (self.running and self._animate):
@@ -15004,7 +15220,7 @@ class Environment:
                     self.pause_at = inf
 
                 if self.pause_at is None:
-                    sg.popup(f"Pause not valid")
+                    sg.popup("Pause not valid")
                 else:
                     if "-PAUSE-EACH-" in self._ui_keys:
                         pause_each_str = values["-PAUSE-EACH-"]
@@ -15023,7 +15239,7 @@ class Environment:
                             self.pause_at = None
 
                     if self.pause_at is None:
-                        sg.popup(f"Pause interval not valid")
+                        sg.popup("Pause interval not valid")
                     else:
                         if self.pause_at > self.t() * 0.99999999:
                             if "-ANIMATE-" in self._ui_keys:
@@ -15626,29 +15842,49 @@ class Animate2dBase(DynamicClass):
                         im = Image.new("RGBA", (int(totwidth + 0.1 * fontsize), int(totheight)), (0, 0, 0, 0))
                         imwidth, imheight = im.size
                         draw = ImageDraw.Draw(im)
-                        pos = 0
+                        ypos = 0
+                        now_color = textcolor
                         for line, width in zip(lines, widths):
                             if line:
-                                draw.text(xy=(0.1 * fontsize, pos), text=line, font=font, fill=textcolor)
-
-                            pos += lineheight
-                        # this code is to correct a bug in the rendering of text,
-                        # leaving a kind of shadow around the text
-                        del draw
-                        if textcolor[:3] != (0, 0, 0):  # black is ok
-                            if False and has_numpy():
-                                arr = numpy.asarray(im).copy()
-                                arr[:, :, 0] = textcolor[0]
-                                arr[:, :, 1] = textcolor[1]
-                                arr[:, :, 2] = textcolor[2]
-                                im = Image.fromarray(numpy.uint8(arr))
-                            else:
-                                pix = im.load()
-                                for y in range(imheight):
-                                    for x in range(imwidth):
-                                        pix[x, y] = (textcolor[0], textcolor[1], textcolor[2], pix[x, y][3])
+                                if "\033[" in line:  # ANSI
+                                    xpos = 0.1 * fontsize
+                                    while line:
+                                        for ansi, rgb in _ANSI_to_rgb.items():
+                                            if line.startswith(ansi):
+                                                if rgb:
+                                                    now_color = rgb
+                                                else:
+                                                    now_color = textcolor
+                                                line = line[len(ansi) :]
+                                                break
+                                        else:
+                                            c = line[0]
+                                            draw.text(xy=(xpos, ypos), text=c, font=font, fill=now_color)
+                                            charwidth = font.getbbox(c)[2]
+                                            xpos += charwidth
+                                            line = line[1:]
 
-                        # end of code to correct bug
+                                else:
+                                    draw.text(xy=(0.1 * fontsize, ypos), text=line, font=font, fill=now_color)
+
+                            ypos += lineheight
+                        # # this code is to correct a bug in the rendering of text,
+                        # # leaving a kind of shadow around the text
+                        # del draw
+                        # if textcolor[:3] != (0, 0, 0):  # black is ok
+                        #     if False and has_numpy():
+                        #         arr = numpy.asarray(im).copy()
+                        #         arr[:, :, 0] = textcolor[0]
+                        #         arr[:, :, 1] = textcolor[1]
+                        #         arr[:, :, 2] = textcolor[2]
+                        #         im = Image.fromarray(numpy.uint8(arr))
+                        #     else:
+                        #         pix = im.load()
+                        #         for y in range(imheight):
+                        #             for x in range(imwidth):
+                        #                 pix[x, y] = (textcolor[0], textcolor[1], textcolor[2], pix[x, y][3])
+
+                        # # end of code to correct bug
 
                         self.imwidth, self.imheight = im.size
                         self.heightA = heightA
@@ -23508,7 +23744,7 @@ class State:
         self.value.tally(value_after)
         self._trywait()
 
-    def _trywait(self, max=inf):
+    def _trywait(self, max=inf):  # this _trywait of a state
         mx = self._waiters._head.successor
         while mx != self._waiters._tail:
             c = mx.component
@@ -25426,7 +25662,6 @@ class Animate3dObj(Animate3dBase):
         global visualization
         global pyglet
 
-
         self.x = x
         self.y = y
         self.z = z
@@ -25451,12 +25686,12 @@ class Animate3dObj(Animate3dBase):
         try:
             import pywavefront
         except ImportError:
-            pywavefront=None
-                
+            pywavefront = None
+
         try:
-            import pyglet   # this is a requirement for visualization!
+            import pyglet  # this is a requirement for visualization!
         except ImportError:
-            pyglet=None
+            pyglet = None
 
         from pywavefront import visualization
 
@@ -25466,7 +25701,7 @@ class Animate3dObj(Animate3dBase):
         global pyglet
         if pywavefront is None:
             raise ImportError("Animate3dObj requires pywavefront. Not found")
-        if pyglet is None:                    
+        if pyglet is None:
             raise ImportError("Animate3dObj requires pyglet. Not found")
 
         obj_filename = Path(self.filename(t))
@@ -26976,8 +27211,6 @@ def getfont(fontname, fontsize):
             return getfont.lookup[(fontname, fontsize)]
     else:
         getfont.lookup = {}
-    if fontname == "":
-        a = 1
     if isinstance(fontname, str):
         fontlist1 = [fontname]
     else:
@@ -27222,7 +27455,7 @@ def can_animate3d(try_only: bool = True) -> bool:
             glut.glutInit()
         except OpenGL.error.NullFunctionError:
             raise ImportError("Installed OpenGL does not support glut. Try 'pip install OpenGL-glut' or see the salabim documentation")
-    
+
         return True
     else:
         if try_only:
@@ -27585,7 +27818,7 @@ def set_environment_aliases():
         return  # do not set when using Sphinx build!
 
     for name, obj in list(globals().items()):
-        if (not name.startswith("_") or name in ("_Trajectory", "_Distribution")) and name != "yieldless" and name != "Environment":
+        if (not name.startswith("_") or name in ("_Trajectory", "_Distribution")) and name != "yieldless" and name != "Environment" and not hasattr(Environment,name):
             if inspect.isclass(obj) and obj.__module__ == Environment.__module__:
                 if issubclass(obj, Exception):
                     exec(f"Environment.{name}={name}")

{salabim-24.0.17 → salabim-25.0.0}/salabim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: salabim
-Version: 24.0.17
+Version: 25.0.0
 Summary: salabim - discrete event simulation in Python
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://salabim.org