tina4-python 0.2.159__tar.gz → 0.2.161__tar.gz

{tina4_python-0.2.159 → tina4_python-0.2.161}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 0.2.159
+Version: 0.2.161
 Summary: Tina4Python - This is not another framework for Python
 Author-email: Andre van Zuydam <andrevanzuydam@gmail.com>
 Requires-Python: <4.0,>=3.12
@@ -107,6 +107,10 @@ https://tina4.com/
 MIT © 2007 – 2025 Tina4 Stack  
 https://opensource.org/licenses/MIT
 
+## Testing 
+
+uv run pytest --verbose
+
 ---
 
 **Tina4** – The framework that keeps out of the way of your coding.

{tina4_python-0.2.159 → tina4_python-0.2.161}/README.md

@@ -87,6 +87,10 @@ https://tina4.com/
 MIT © 2007 – 2025 Tina4 Stack  
 https://opensource.org/licenses/MIT
 
+## Testing 
+
+uv run pytest --verbose
+
 ---
 
 **Tina4** – The framework that keeps out of the way of your coding.

{tina4_python-0.2.159 → tina4_python-0.2.161}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tina4-python"
-version = "0.2.159"
+version = "0.2.161"
 description = "Tina4Python - This is not another framework for Python"
 authors = [
     {name = "Andre van Zuydam",email = "andrevanzuydam@gmail.com"}

{tina4_python-0.2.159 → tina4_python-0.2.161}/tina4_python/Queue.py

@@ -55,7 +55,7 @@ class Message:
     delivery_tag: str
 
 class Queue:
-    def __init__(self, config=None, topic="default-queue", callback=None):
+    def __init__(self, config=None, topic="default-queue", callback=None, batch_size=1):
         if config is None:
             config = Config()
         self.config = config
@@ -63,6 +63,7 @@ class Queue:
         self.callback = callback
         self.producer = None
         self.consumer = None
+        self.batch_size = batch_size
         init_method = f"init_{config.queue_type.replace('-', '_')}"
         getattr(self, init_method)()
 
@@ -101,53 +102,81 @@ class Queue:
                 delivery_callback(self.producer, e, None)
             return e
 
-    def consume(self, acknowledge: bool = True) -> Generator[Message, None, None]:
+    def consume(self, acknowledge: bool = True) -> Generator[Message | List[Message], None, None]:
         """
-        Generator that yields messages one by one.
+        Generator that continuously yields messages from the queue as they arrive.
         Use like:
             for msg in queue.consume():
                 print(msg.data)
+        If a callback was provided in __init__, it will also be called for each message.
         """
         prefix = self.get_prefix()
+        is_batch = self.batch_size > 1
+        count_messages = 0
         try:
-            if self.config.queue_type == "litequeue":
-                msg = self.consumer.pop()
-                if msg:
-                    data = json.loads(msg.data)
-                    response = Message(msg.message_id, data["msg"], data["user_id"], msg.status, msg.in_time, "0")
-                    if acknowledge:
-                        self.consumer.done(msg.message_id)
-                        msg = self.consumer.get(msg.message_id)
-                        response.status = int(msg.status)
-                    yield response
+            message_found = True
+            batch = []
+            while message_found and count_messages < self.batch_size:
+                response = None
+                message_found = False
 
-            elif self.config.queue_type == "mongo-queue-service":
-                msg = self.consumer.next(channel=prefix + self.topic)
-                if msg:
-                    data = msg.payload
-                    response = Message(data["message_id"], data["msg"], data["user_id"], 2 if acknowledge else 1, msg.queued_at, "0")
-                    if acknowledge:
-                        msg.complete()
-                    yield response
+                if self.config.queue_type == "litequeue":
+                    msg = self.consumer.pop()
+                    if msg:
+                        message_found = True
+                        data = json.loads(msg.data)
+                        response = Message(msg.message_id, data["msg"], data["user_id"], msg.status, msg.in_time, "0")
+                        if acknowledge:
+                            self.consumer.done(msg.message_id)
+                            updated = self.consumer.get(msg.message_id)
+                            if updated:
+                                response.status = int(updated.status)
 
-            elif self.config.queue_type == "rabbitmq":
-                method, _, body = self.consumer.basic_get(queue=prefix + self.topic, auto_ack=acknowledge)
-                if method:
-                    data = json.loads(body)
-                    response = Message(data["message_id"], data["msg"], data["user_id"], 2 if acknowledge else 1, data["in_time"], method.delivery_tag)
-                    yield response
+                elif self.config.queue_type == "mongo-queue-service":
+                    msg = self.consumer.next(channel=prefix + self.topic)
+                    if msg:
+                        message_found = True
+                        data = msg.payload
+                        response = Message(data["message_id"], data["msg"], data["user_id"], 2 if acknowledge else 1, msg.queued_at, "0")
+                        if acknowledge:
+                            msg.complete()
 
-            elif self.config.queue_type == "kafka":
-                msg = self.consumer.poll(0.1)  # non-blocking poll
-                if msg and not msg.error():
-                    data = json.loads(msg.value().decode('utf-8'))
-                    response = Message(data["message_id"], data["msg"], data["user_id"], 2 if acknowledge else 1, data["in_time"], str(msg.offset()))
-                    if acknowledge:
-                        self.consumer.commit()
-                    yield response
+                elif self.config.queue_type == "rabbitmq":
+                    method, _, body = self.consumer.basic_get(queue=prefix + self.topic, auto_ack=acknowledge)
+                    if method:
+                        message_found = True
+                        data = json.loads(body)
+                        response = Message(data["message_id"], data["msg"], data["user_id"], 2 if acknowledge else 1, data["in_time"], method.delivery_tag)
+
+                elif self.config.queue_type == "kafka":
+                    msg = self.consumer.poll(0.1)
+                    if msg and not msg.error():
+                        message_found = True
+                        data = json.loads(msg.value().decode('utf-8'))
+                        response = Message(data["message_id"], data["msg"], data["user_id"], 2 if acknowledge else 1, data["in_time"], str(msg.offset()))
+                        if acknowledge:
+                            self.consumer.commit()
+
+                if message_found:
+                    count_messages += 1
+                    batch.append(response)
+                    if self.callback:
+                        try:
+                            self.callback(response)
+                        except Exception as e:
+                            Debug.error("Failed to run queue callback", str(e))
+                else:
+                    # No message available right now — brief sleep to avoid busy loop
+                    time.sleep(0.05)
 
+            if len(batch) > 0:
+                if not is_batch:
+                    yield batch[0]
+                else:
+                    yield batch
         except Exception as e:
             Debug.error(f"Error consuming {self.topic}: {e}")
+            raise  # Re-raise to stop consumption on fatal error
 
     # init methods remain unchanged
     def init_litequeue(self):
@@ -238,18 +267,21 @@ class Consumer:
         self.poll_interval = poll_interval
 
     def messages(self) -> Generator[Message, None, None]:
-        """Generator that yields messages from all configured queues forever"""
         Debug.debug("Consuming from queues", [q.topic for q in self.queues])
         while True:
+            emptied_count = 0
             for queue in self.queues:
+                drained = False
                 for message in queue.consume(self.acknowledge):
                     yield message
-            time.sleep(self.poll_interval)
+                    drained = True
+                if not drained:
+                    emptied_count += 1
+            if emptied_count == len(self.queues):
+                time.sleep(self.poll_interval)
 
     def run_forever(self):
         """Simple blocking runner — easy to use"""
         for message in self.messages():
             Debug.info(f"Received message: {message.message_id} -> {message.data}")
-            # Do something with message here
-            # Or just pass to a callback if needed
 

{tina4_python-0.2.159 → tina4_python-0.2.161}/tina4_python/Webserver.py

@@ -534,9 +534,9 @@ class Webserver:
             # Route or WebSocket
             # ------------------------------------------------------------------
             if "sec-websocket-key" in lowercase_headers:
-                await self.get_response(self.method, reader, writer)
+                await self.get_response(self.method, scope={'type': 'websocket'}, reader=reader, writer=writer)
             else:
-                response_bytes = await self.get_response(self.method, reader, writer)
+                response_bytes = await self.get_response(self.method, scope={'type': 'http'}, reader=reader, writer=writer)
                 if response_bytes:
                     writer.write(response_bytes)
                     await writer.drain()

{tina4_python-0.2.159 → tina4_python-0.2.161}/tina4_python/Websocket.py

@@ -32,12 +32,12 @@ class Websocket:
             else:
                 if os.name == "nt":
                     connection = await self.server.AioServer.accept(
-                        sock=TransportSocket(self.request.transport.transport._sock), # not working properly
+                        sock=TransportSocket(self.request.asgi_writer.transport._sock), # not working properly
                         headers=self.request.headers
                     )
                 else:
                     connection = await self.server.AioServer.accept(
-                        sock=self.request.transport.get_extra_info('socket').dup(),
+                        sock=self.request.asgi_writer.get_extra_info('socket').dup(),
                         headers=self.request.headers
                     )
             return connection