asimpy 0.4.1__py3-none-any.whl → 0.5.0__py3-none-any.whl

asimpy/environment.py

@@ -5,10 +5,13 @@ import heapq
 import itertools
 from typing import Callable
 
+from .event import NO_TIME
 from .timeout import Timeout
 
 
 class Environment:
+    """Simulation environment."""
+
     def __init__(self, logging=False):
         self._now = 0
         self._logging = logging
@@ -29,8 +32,9 @@ class Environment:
             pending = heapq.heappop(self._pending)
             if until is not None and pending.time > until:
                 break
-            self._now = pending.time
-            pending.callback()
+            result = pending.callback()
+            if (result is not NO_TIME) and (pending.time > self._now):
+                self._now = pending.time
 
     def _immediate(self, callback):
         self.schedule(self._now, callback)

asimpy/event.py

@@ -6,6 +6,10 @@ if TYPE_CHECKING:
     from .environment import Environment
 
 
+NO_TIME = object()
+"""Sentinel indicating that time should not advance."""
+
+
 class Event:
     """Manage an event."""
 

asimpy/simqueue.py

@@ -52,6 +52,19 @@ class Queue:
 class PriorityQueue(Queue):
     """Ordered queue."""
 
+    async def get(self):
+        """Get highest priority item from the queue."""
+        if self._items:
+            item = heapq.heappop(self._items)
+            evt = Event(self._env)
+            self._env._immediate(lambda: evt.succeed(item))
+            evt._on_cancel = lambda: heapq.heappush(self._items, item)
+            return await evt
+
+        evt = Event(self._env)
+        self._getters.append(evt)
+        return await evt
+
     async def put(self, item: Any):
         """
         Add one item to the queue.

asimpy/timeout.py

@@ -1,7 +1,7 @@
 """Wait for a simulated time to pass."""
 
 from typing import TYPE_CHECKING
-from .event import Event
+from .event import NO_TIME, Event
 
 if TYPE_CHECKING:
     from .environment import Environment
@@ -20,4 +20,10 @@ class Timeout(Event):
         """
         assert delay >= 0
         super().__init__(env)
-        env.schedule(env.now + delay, lambda: self.succeed())
+        env.schedule(env.now + delay, self._fire)
+
+    def _fire(self):
+        """Handle cancellation case."""
+        if self._cancelled:
+            return NO_TIME
+        self.succeed()

{asimpy-0.4.1.dist-info → asimpy-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: asimpy
-Version: 0.4.1
+Version: 0.5.0
 Summary: A simple discrete event simulator using async/await
 Author-email: Greg Wilson <gvwilson@third-bit.com>
 Maintainer-email: Greg Wilson <gvwilson@third-bit.com>
@@ -10,17 +10,6 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.12
-Provides-Extra: dev
-Requires-Dist: build>=1.4.0; extra == 'dev'
-Requires-Dist: markdown-include>=0.8.1; extra == 'dev'
-Requires-Dist: mkdocs-awesome-pages-plugin>=2.10.1; extra == 'dev'
-Requires-Dist: mkdocs-material>=9.7.1; extra == 'dev'
-Requires-Dist: mkdocs>=1.6.1; extra == 'dev'
-Requires-Dist: mkdocstrings[python]>=1.0.0; extra == 'dev'
-Requires-Dist: ruff>=0.14.10; extra == 'dev'
-Requires-Dist: taskipy>=1.14.1; extra == 'dev'
-Requires-Dist: twine>=6.2.0; extra == 'dev'
-Requires-Dist: ty>=0.0.11; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # asimpy
@@ -30,7 +19,6 @@ A simple discrete event simulation framework in Python using `async`/`await`.
 -   [Documentation][docs]
 -   [Package][package]
 -   [Repository][repo]
--   [Examples][examples]
 
 *Thanks to the creators of [SimPy][simpy] for inspiration.*
 
@@ -234,8 +222,7 @@ The sequence of events is:
 | FirstOf succeeds with winner              | q1=[], q2=["B"]    | _value=("a","A"), _triggered=True       | Processes waiting on FirstOf resumed             | `Tester` receives ("a","A")                               |
 | `Tester` continues execution              | q1=[], q2=["B"]    | -                                       | -                                                | Remaining queue items untouched; correct order guaranteed |
 
-[docs]: https://gvwilson.github.io/asimpy
-[examples]: https://gvwilson.github.io/asimpy/examples/
+[docs]: https://asimpy.readthedocs.io/
 [package]: https://pypi.org/project/asimpy/
 [repo]: https://github.com/gvwilson/asimpy
 [simpy]: https://simpy.readthedocs.io/

{asimpy-0.4.1.dist-info → asimpy-0.5.0.dist-info}/RECORD

@@ -2,15 +2,15 @@ asimpy/__init__.py,sha256=c01u2z29W688jAccd6OKnON132IueBKn31JrcA5wNSk,490
 asimpy/_adapt.py,sha256=-rUIvJMneEDdxdiMImwXYfMChsqdQwWoyHVsDCsxRKI,521
 asimpy/allof.py,sha256=artqJqBHUaHh8oOk3a3tpqIlt5sJzGW9VEJ2-YkdECU,1211
 asimpy/barrier.py,sha256=evubm6H_93qi9vBogqrNLg1dZosY7YdnCnJc1jNGYW4,770
-asimpy/environment.py,sha256=ndjPR7W-j7FPwV7ze5Icen-xRgHKYGLNl5M2m26d4Fw,1205
-asimpy/event.py,sha256=zAExS6m72SWTuk6zkx9eADCx9JzPl-vStUhAQNmux0A,1360
+asimpy/environment.py,sha256=EEHkW6vuQJF9koY_DrNVXQ9bUj4GQDKRWkGCqvDx9U0,1351
+asimpy/event.py,sha256=gS4_PHydP6MUNaEG2o0L8QK67Y1R_9dybJq4BEQXsu8,1437
 asimpy/firstof.py,sha256=htwskm_5lwBVD6yb7hD8jmAypeaJJk5iUqB7cKPYWyk,1356
 asimpy/interrupt.py,sha256=tybPzsCeX7cpVL6psOUQf6egcAujV0vnJe1zDwkZWxo,406
 asimpy/process.py,sha256=IQldzjqF5CuBUccdkM3ZV5mEtEIivZx8whGeNEr2jIc,2349
 asimpy/resource.py,sha256=Ml8E71FdJ61Sy6dcoXyQkb0SXLv6xRBkI7Rkriyu438,1680
-asimpy/simqueue.py,sha256=Vh70iIRNpEXt2yo7LgosTdpxt1wSjKiyr4-1If5ckEs,1515
-asimpy/timeout.py,sha256=yRKJvKPITB75u25ZnE3-bk3yMC39w4bPnh9yZ_pNSes,549
-asimpy-0.4.1.dist-info/METADATA,sha256=MU4Q_Q0sqjAStfb2yIsQz_QvJiRSvdCMaUPEJAOFH9I,9315
-asimpy-0.4.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-asimpy-0.4.1.dist-info/licenses/LICENSE.md,sha256=IjTDUvBk8xdl_n50CG1Vtk4FYdrS-C3uEYrRWAoOQqQ,1066
-asimpy-0.4.1.dist-info/RECORD,,
+asimpy/simqueue.py,sha256=B826YjNKHXkdkRRYPijQETkF9w84hoWNT4an_YQcalw,1953
+asimpy/timeout.py,sha256=75OqbpLeepJ5UdSN6F6JZ0ctlr53jpuilaI7Wxi9XP8,686
+asimpy-0.5.0.dist-info/METADATA,sha256=gsgdx4ouMqpNgHBGLaKfC5ygBWEjNgYlv8IwmCRohKc,8709
+asimpy-0.5.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+asimpy-0.5.0.dist-info/licenses/LICENSE.md,sha256=IjTDUvBk8xdl_n50CG1Vtk4FYdrS-C3uEYrRWAoOQqQ,1066
+asimpy-0.5.0.dist-info/RECORD,,