PyPI - setta - Versions diffs - 0.0.3.dev8__py3-none-any.whl → 0.0.3.dev9__py3-none-any.whl - Mend

setta 0.0.3.dev8py3-none-any.whl → 0.0.3.dev9py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

setta/static/frontend/index.html CHANGED Viewed

@@ -15,7 +15,7 @@
     <title>setta.dev</title>
-    <script type="module" crossorigin src="/static/assets/index-8204c872.js"></script>
+    <script type="module" crossorigin src="/static/assets/index-d7ede6b5.js"></script>
     <link rel="stylesheet" href="/static/assets/index-af271c9f.css">
   </head>
   <body>

setta/tasks/tasks.py CHANGED Viewed

@@ -1,5 +1,7 @@
 import asyncio
+import copy
 import logging
+import time
 from typing import Dict
 from setta.database.utils import create_new_id
@@ -63,12 +65,12 @@ class Tasks:
         tasks = []
         results = []
-        for sp_info in self.in_memory_subprocesses.values():
-            for fn_name, dependencies in sp_info["dependencies"].items():
+        for sp_key, sp_info in self.in_memory_subprocesses.items():
+            for fn_name, fnInfo in sp_info["fnInfo"].items():
                 if (
                     call_all
-                    or None in dependencies
-                    or any(k in dependencies for k in message.content.keys())
+                    or None in fnInfo["dependencies"]
+                    or any(k in fnInfo["dependencies"] for k in message.content.keys())
                 ):
                     # Send message to subprocess
                     sp_info["subprocess"].parent_conn.send(
@@ -78,6 +80,8 @@ class Tasks:
                     # Create task for receiving response
                     task = asyncio.create_task(
                         self._handle_subprocess_response(
+                            sp_key,
+                            fn_name,
                             message.id,
                             sp_info["subprocess"].parent_conn.recv,
                             websocket_manager,
@@ -100,30 +104,40 @@ class Tasks:
         return {"content": content, "messageType": C.WS_IN_MEMORY_FN_RETURN}
     async def _handle_subprocess_response(
-        self, msg_id, recv_fn, websocket_manager, results
+        self, subprocess_key, fn_name, msg_id, recv_fn, websocket_manager, results
     ):
         # Run the receive function in a thread
+        start_time = time.perf_counter()
         result = await self.task_runner.run(recv_fn, [], RunType.THREAD)
+        elapsed_time = time.perf_counter() - start_time
         if result["status"] == "success":
-            if websocket_manager is not None and result["content"]:
-                await websocket_manager.send_message_to_requester(
-                    msg_id, result["content"], result["messageType"]
+            self.update_average_subprocess_fn_time(
+                subprocess_key, fn_name, elapsed_time
+            )
+            if websocket_manager is not None:
+                if result["content"]:
+                    await websocket_manager.send_message_to_requester(
+                        msg_id, result["content"], result["messageType"]
+                    )
+                await self.maybe_send_latest_run_time_info(
+                    subprocess_key, fn_name, msg_id, websocket_manager
                 )
-            else:
-                results.append(result)
+        else:
+            results.append(result)
     async def add_custom_fns(self, code_graph, to_cache):
         for c in code_graph:
             subprocess_key = c["subprocess_key"]
             module_name = c["module_name"]
             sp = self.in_memory_subprocesses.get(subprocess_key, {}).get("subprocess")
-            if not sp:
-                logger.debug(f"Creating new subprocess for {module_name}")
-                sp = SettaInMemoryFnSubprocess(self.stop_event, self.websockets)
-                self.in_memory_subprocesses[subprocess_key] = {
-                    "subprocess": sp,
-                    "dependencies": {},
-                }
+            if sp:
+                sp.close()
+            logger.debug(f"Creating new subprocess for {module_name}")
+            sp = SettaInMemoryFnSubprocess(self.stop_event, self.websockets)
+            self.in_memory_subprocesses[subprocess_key] = {
+                "subprocess": sp,
+                "fnInfo": {},
+            }
             sp.parent_conn.send(
                 {
@@ -134,17 +148,22 @@ class Tasks:
                 }
             )
             result = await self.task_runner.run(sp.parent_conn.recv, [], RunType.THREAD)
-            sp_info = self.in_memory_subprocesses[subprocess_key]
+            fnInfo = self.in_memory_subprocesses[subprocess_key]["fnInfo"]
             if result["status"] == "success":
-                sp_info["dependencies"].update(result["content"])
+                for k, v in result["content"].items():
+                    if k not in fnInfo:
+                        fnInfo[k] = {
+                            "dependencies": set(),
+                            "averageRunTime": None,
+                            "callCount": 0,
+                            "lastStatsUpdate": time.time(),
+                        }
+                    fnInfo[k]["dependencies"].update(v)
             else:
                 # TODO: store error message and display on frontend?
                 pass
-        all_dependencies = set()
-        for d in sp_info["dependencies"].values():
-            all_dependencies.update(d)
         initial_result = await self.call_in_memory_subprocess_fn(
             TaskMessage(id=create_new_id(), content={}), call_all=True
         )
@@ -153,9 +172,41 @@ class Tasks:
             f"self.in_memory_subprocesses keys: {self.in_memory_subprocesses.keys()}"
         )
-        return all_dependencies, initial_result["content"]
+        return initial_result["content"]
     def close(self):
         self.stop_event.set()
         for v in self.in_memory_subprocesses.values():
             v["subprocess"].close()
+    def update_average_subprocess_fn_time(self, subprocess_key, fn_name, new_time):
+        fnInfo = self.in_memory_subprocesses[subprocess_key]["fnInfo"][fn_name]
+        current_avg = fnInfo["averageRunTime"]
+        new_avg = (
+            new_time
+            if current_avg is None
+            else ((0.9) * current_avg) + (0.1 * new_time)
+        )
+        fnInfo["averageRunTime"] = new_avg
+        fnInfo["callCount"] += 1
+        fnInfo["lastStatsUpdate"] = time.time()
+    async def maybe_send_latest_run_time_info(
+        self, subprocess_key, fn_name, msg_id, websocket_manager
+    ):
+        fnInfo = self.in_memory_subprocesses[subprocess_key]["fnInfo"][fn_name]
+        if fnInfo["callCount"] % 10 == 0 or (
+            fnInfo["lastStatsUpdate"] and (time.time() - fnInfo["lastStatsUpdate"]) > 10
+        ):
+            newInfo = self.getInMemorySubprocessInfo()
+            await websocket_manager.send_message_to_requester(
+                msg_id, newInfo, C.WS_IN_MEMORY_FN_AVG_RUN_TIME
+            )
+    def getInMemorySubprocessInfo(self):
+        output = {}
+        for sp_key, sp_info in self.in_memory_subprocesses.items():
+            output[sp_key] = {"fnInfo": copy.deepcopy(sp_info["fnInfo"])}
+            for fnInfo in output[sp_key]["fnInfo"].values():
+                fnInfo["dependencies"] = list(fnInfo["dependencies"])
+        return output

setta/tasks/utils.py CHANGED Viewed

@@ -53,7 +53,8 @@ class SettaInMemoryFnSubprocess:
         self.process.daemon = True  # Ensure process dies with parent
         self.process.start()
-        self.stop_event = stop_event
+        self.stop_event = asyncio.Event()
+        self.tasks_stop_event = stop_event
         self.websockets = websockets
         self.stdout_queue = queue.Queue()
         self.stdout_processor_task = None
@@ -99,15 +100,15 @@ class SettaInMemoryFnSubprocess:
                     # Import and store module
                     module = import_code_from_string(code, module_name)
                     added_fn_names = add_fns_from_module(fns_dict, module, module_name)
-                    task_metadata = {}
+                    dependencies = {}
                     for k in added_fn_names:
                         cache[k] = msg["to_cache"]
-                        task_metadata[k] = get_task_metadata(fns_dict[k], cache[k])
+                        dependencies[k] = get_task_metadata(fns_dict[k], cache[k])
                     self.child_conn.send(
                         {
                             "status": "success",
-                            "content": task_metadata,
+                            "content": dependencies,
                         }
                     )
@@ -138,22 +139,34 @@ class SettaInMemoryFnSubprocess:
     def close(self):
         try:
+            logger.debug("Initiating shutdown sequence")
             self.parent_conn.send({"type": "shutdown"})
-            self.process.join(timeout=1.0)
-        except:
-            pass
+            self.process.join(timeout=2)  # Add timeout to process join
-        if self.process.is_alive():
-            self.process.terminate()
-            self.process.join()
+            if self.process.is_alive():
+                logger.debug("Process still alive after timeout, forcing termination")
+                self.process.terminate()
+                self.process.join(timeout=1)
+        except Exception as e:
+            logger.debug(f"Error during process shutdown: {e}")
-        # Close both sets of connections
-        self.parent_conn.close()
-        self.child_conn.close()
-        self.stdout_parent_conn.close()
-        self.stdout_child_conn.close()
+        # Set stop event before closing pipes
+        self.stop_event.set()
+        # Close all connections
+        for conn in [
+            self.parent_conn,
+            self.child_conn,
+            self.stdout_parent_conn,
+            self.stdout_child_conn,
+        ]:
+            conn.close()
+        self.stdout_thread.join(timeout=2)  # Add timeout to thread join
+        if self.stdout_thread.is_alive():
+            logger.debug("Stdout thread failed to terminate within timeout")
-        self.stdout_thread.join()
         if self.stdout_processor_task:
             self.stdout_processor_task.cancel()
@@ -183,9 +196,9 @@ class SettaInMemoryFnSubprocess:
             self.stdout_processor_task = None
     async def process_stdout_queue(self):
-        while not self.stop_event.is_set():
+        while not self.should_stop():
             try:
-                if self.stop_event.is_set():
+                if self.should_stop():
                     break
                 if len(self.websockets) > 0:
                     stdout_data = self.stdout_queue.get_nowait()
@@ -198,19 +211,28 @@ class SettaInMemoryFnSubprocess:
             except asyncio.CancelledError:
                 break
             except Exception as e:
-                if self.stop_event.is_set():
+                if self.should_stop():
                     break
                 logger.debug(f"Error processing stdout: {e}")
     def stdout_listener(self):
-        while not self.stop_event.is_set():
-            try:
-                stdout_data = self.stdout_parent_conn.recv()
-                self.stdout_queue.put(stdout_data)  # simple put, no async needed
-            except Exception as e:
-                if self.stop_event.is_set():
+        while not self.should_stop():
+            if self.stdout_parent_conn.poll(0.1):  # Check for data with timeout
+                try:
+                    stdout_data = self.stdout_parent_conn.recv()
+                    self.stdout_queue.put(stdout_data)
+                except EOFError:  # Pipe was closed
+                    break
+                except Exception as e:
+                    logger.debug(f"Error in stdout listener: {e}")
+                    if self.should_stop():
+                        break
+            else:  # No data available within timeout
+                if self.should_stop():
                     break
-                logger.debug(f"Error in stdout listener: {e}")
+    def should_stop(self):
+        return self.stop_event.is_set() or self.tasks_stop_event.is_set()
 def add_fns_from_module(fns_dict, module, module_name=None):

{setta-0.0.3.dev8.dist-info → setta-0.0.3.dev9.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: setta
-Version: 0.0.3.dev8
+Version: 0.0.3.dev9
 Home-page: https://setta.dev
 Project-URL: GitHub, https://github.com/settadev/setta
 License-File: LICENSE

{setta-0.0.3.dev8.dist-info → setta-0.0.3.dev9.dist-info}/RECORD RENAMED Viewed

@@ -1,4 +1,4 @@
-setta/__init__.py,sha256=VRMrMIrGmnKm4x2-C0jl9DIpY57NuqIv9j7dygH9Wjo,27
+setta/__init__.py,sha256=mRKlQs_lYaraYvOzYlGQDMNDPQsRu2O-zNqzBFCdPLA,27
 setta/server.py,sha256=P78BMFvcCokVhjnVlNIKcmpCSvmzSqt-33bx4bhOe6Y,4626
 setta/start.py,sha256=jEeSiocLeBitvg48fa6k1CpLnPI63JHkQ8O-WVM6ch8,3078
 setta/cli/__init__.py,sha256=UxZG_VOMuF6lEBT3teUgTS9ulsK3wt3Gu3BbAQiAmt8,47
@@ -87,7 +87,7 @@ setta/routers/artifact.py,sha256=9wHdreg5DsLshhET-6gEDw2Apw_-r8bRF1x3-_dD9mU,266
 setta/routers/code_info.py,sha256=rDBLkr5VQOlktap3hWA73ls0VrBi5y4mc_SfWzw9ad0,857
 setta/routers/dependencies.py,sha256=lQDZFcXw-jUXK1q8yglUg3jY9dKoE-xvVcWckKqmOr4,1126
 setta/routers/in_memory_fn_stdout_websocket.py,sha256=T2BpLzh6PwYQP0qIkFS4r_VfEKBlwl4gkwIaq6r6Phs,604
-setta/routers/interactive.py,sha256=juUtPmCyqHSnIb5k6iOYUtfmukp1Z6x25wISlANgUic,4385
+setta/routers/interactive.py,sha256=V68ooA_C2rSqyXeARHifvr_17iCfLrWPERLSrrb_PIU,4316
 setta/routers/lsp.py,sha256=DAZqdiRKDWJ9ikjwQetV4_8s9U-EDC91ToJA3u57qnU,385
 setta/routers/projects.py,sha256=p3zPD3jobYOxBGJSSIYS1Aqu1w-PrJCcEN6dPJ0DT6E,5255
 setta/routers/reference_renaming.py,sha256=Ec1hz2Nz_hYqk8GyGmUcWKvXo-lVEDbIIK2YbX-wi00,3598
@@ -97,7 +97,7 @@ setta/routers/terminals.py,sha256=91I3tVUPJtLyCD_-E_qBQ_k8uuNUrcXl5P7sCTQuDQE,24
 setta/routers/websocket.py,sha256=6fSROv9C5PobPXppUWwNLDDO0p8VADYaf2KcgIuTQp4,1121
 setta/static/constants/BaseUITypes.json,sha256=S08qzaNwjclRKuC9U3J0_PpmDTw5aQFwKQcUb0SiiR4,3873
 setta/static/constants/Settings.json,sha256=-cpSDnjJ9s86z_hfC69xq7A4kxqphKXqssMUUhTN4BQ,3444
-setta/static/constants/constants.json,sha256=mijCGv64ZQ6uTvsIhZ22DBiJjBmsEfn8krBef78aQyk,5093
+setta/static/constants/constants.json,sha256=ICVe1HiGoUlSyiuNptfLX7rimHJk_7SfN38MWJEL62c,5151
 setta/static/constants/db_init.sql,sha256=eSYQrcEEqNPcshOHJEOpSGGkoN_FJwMfZqJFrbnX_8U,8416
 setta/static/constants/defaultValues.json,sha256=7S8wabxk7CIM23H0FcXdLaIhhldsFUfN8lrzWAIU5pQ,2948
 setta/static/constants/settingsProject.json,sha256=yfSIQpu2zUcFnUp2JimAkZ0ispvMv8lMPUUTx4AWSi4,10006
@@ -108,7 +108,7 @@ setta/static/frontend/browserconfig.xml,sha256=w0iw1t89kA7-965LTfyLYrFzewTQnUWE_
 setta/static/frontend/favicon-16x16.png,sha256=q67Crpy8s3wryu7Y3kffPeysN99Lt4XeFygXhPKize8,740
 setta/static/frontend/favicon-32x32.png,sha256=4NKXYticYdMrRHmVveHjxqnBU1HWgBT5JyJG8lx3BNE,1027
 setta/static/frontend/favicon.ico,sha256=02qhEBLsvsgBTZX6dcZElMyivlvrR7Yr6wB8ItEZFsc,15086
-setta/static/frontend/index.html,sha256=6pKKvUKghX6IJ3Osmo1icsm9NVQaqwUXVSKZRfh2noo,1296
+setta/static/frontend/index.html,sha256=C5t7lfzDhTvNFweX0ISsHGNyj8TkHAz8uv-VwByWtlY,1296
 setta/static/frontend/manifest.json,sha256=ULPYw5A68_eNhxuUVXqxT045yhkurKPSz6hjyGcnmhQ,492
 setta/static/frontend/mstile-144x144.png,sha256=wQqckmRWre2NCCevevI3rv4j0tcduVMkpYr2tPj73cs,2692
 setta/static/frontend/mstile-150x150.png,sha256=FUwy6PipTofnhmJB5CdXWYgwy-2inq_sIOdOwdDklcY,2674
@@ -184,8 +184,8 @@ setta/static/frontend/assets/cormorant-garamond-latin-700-italic-0bc53e12.woff2,
 setta/static/frontend/assets/cormorant-garamond-latin-ext-700-italic-525738e0.woff2,sha256=Ulc44CPXdUiI5dY86W76HLk7801Fm9_QywCV-8GRtFU,17240
 setta/static/frontend/assets/cormorant-garamond-vietnamese-700-italic-99563037.woff2,sha256=mVYwN54qI0RLXqyrDGPUNpBHWSJDKjgUyBRWa2FJ_ao,5248
 setta/static/frontend/assets/erase-5e0448ea.svg,sha256=XgRI6pChr392LJ-pGbwqqkN8OWcJMEtRGX-Gv-90qjw,872
-setta/static/frontend/assets/index-8204c872.js,sha256=3vVnv6_MeYW0qxkfUH5ecJwXxeb4lJevbvhWT60vXxQ,2847453
 setta/static/frontend/assets/index-af271c9f.css,sha256=ryccn_uul30_aMdIhgzMlq6GcE0D6x8fyfneCdgaY9o,232608
+setta/static/frontend/assets/index-d7ede6b5.js,sha256=giu4kQ9aQjEAt6f0_j7KZXnM0XNGtAXSIdOXAO3q_40,2848353
 setta/static/frontend/assets/inter-all-400-normal-054f12d0.woff,sha256=BU8S0GmcIMyYte4ESEdQJO-WvL2Rb-38m1n0ujdbYxI,128624
 setta/static/frontend/assets/inter-all-600-normal-c03769e5.woff,sha256=wDdp5VNyQL_IbxcPThD2qI-ETg_QKj7AmCwMCjqDfLE,139072
 setta/static/frontend/assets/inter-all-800-normal-15dc6e4b.woff,sha256=FdxuS9xuVumB5nbVcCXyt3IWqzS4Z75qiRz_0FV5al0,139120
@@ -232,8 +232,8 @@ setta/static/seed/.DS_Store,sha256=ENxJvDQd7Te_U8gExcXtHE-mAeBUYOHELRfDWgN1NmA,6
 setta/static/seed/examples/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
 setta/tasks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 setta/tasks/task_runner.py,sha256=gMXpfZWFMQbix2MfrHVCKB7BxQCjO8JH2P8cxUmt1ms,849
-setta/tasks/tasks.py,sha256=6VLxadVQecHRw3yGJ-AGWe8ARgzyCbwr5fGga_9px1E,6007
-setta/tasks/utils.py,sha256=SFUn2reG9DjinBrdJ84W8CPGqt0XhEQhz5kIS-pNai4,8587
+setta/tasks/tasks.py,sha256=0VYL2P9bOV5b82OHEuIIIhixBit9qcoK817x5JZdpQE,8126
+setta/tasks/utils.py,sha256=9XfSoqYsUf9rBWorZTEqGXfU6J6-nDztIkkgRo1ndhQ,9509
 setta/tasks/fns/__init__.py,sha256=JhGzzQGaT9BWtF3pOmguh6pzIF9kdG3jdDNLyYZ2w7g,461
 setta/tasks/fns/codeAreaAutocomplete.py,sha256=gJ5JbjkWDyTothr-UF-YlOxrbVzj2iyOVK7XD3lfhSQ,6416
 setta/tasks/fns/codeAreaFindTemplateVars.py,sha256=vD9rY8VNPavv6VKa1bnxRPPRDNvFQy6mPIZRl-_3GnY,3708
@@ -254,9 +254,9 @@ setta/utils/generate_new_filename.py,sha256=KBLX6paDmTvXR-027TpqQkfijIXc7mCfhen-
 setta/utils/section_contents.py,sha256=V2HQPik6DfSXw4j7IalbP5AZ3OEGCbtL5ub3xL-Q_Qo,4141
 setta/utils/utils.py,sha256=KjzcvgM3Ab3IcE8vaWYtgBpwzPLKg0LmblnHLoYZJHM,9164
 setta/utils/websocket_manager.py,sha256=S2lEGZsc2OhW0yKLW9VEcH7wi7ppzTfDMQa_hxf3ovc,3772
-setta-0.0.3.dev8.dist-info/LICENSE,sha256=us9fuCq9wmiZVzayjKxNZ2iJYF6dROe0Qp57ToCO7XU,11361
-setta-0.0.3.dev8.dist-info/METADATA,sha256=HHh9zIUqN15JpKkBkfLsfC3YFSp1WYPrt1uB3Z1Wo1o,829
-setta-0.0.3.dev8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-setta-0.0.3.dev8.dist-info/entry_points.txt,sha256=P0qCESy9fWF2q1EQ9JufGldCSnPHplDPn8J6Bgk5hB0,42
-setta-0.0.3.dev8.dist-info/top_level.txt,sha256=8G4lmRzVOnJ11_DescPVHE6MQZH-o06A0nGsDDV2ngY,6
-setta-0.0.3.dev8.dist-info/RECORD,,
+setta-0.0.3.dev9.dist-info/LICENSE,sha256=us9fuCq9wmiZVzayjKxNZ2iJYF6dROe0Qp57ToCO7XU,11361
+setta-0.0.3.dev9.dist-info/METADATA,sha256=OXk3_WwJkRIycDIw9YOQFDWJpYQlWXv5TQLznCHNd_g,829
+setta-0.0.3.dev9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+setta-0.0.3.dev9.dist-info/entry_points.txt,sha256=P0qCESy9fWF2q1EQ9JufGldCSnPHplDPn8J6Bgk5hB0,42
+setta-0.0.3.dev9.dist-info/top_level.txt,sha256=8G4lmRzVOnJ11_DescPVHE6MQZH-o06A0nGsDDV2ngY,6
+setta-0.0.3.dev9.dist-info/RECORD,,

{setta-0.0.3.dev8.dist-info → setta-0.0.3.dev9.dist-info}/LICENSE RENAMED Viewed

File without changes

{setta-0.0.3.dev8.dist-info → setta-0.0.3.dev9.dist-info}/WHEEL RENAMED Viewed

File without changes

{setta-0.0.3.dev8.dist-info → setta-0.0.3.dev9.dist-info}/entry_points.txt RENAMED Viewed

File without changes

{setta-0.0.3.dev8.dist-info → setta-0.0.3.dev9.dist-info}/top_level.txt RENAMED Viewed

File without changes

setta 0.0.3.dev8__py3-none-any.whl → 0.0.3.dev9__py3-none-any.whl

setta 0.0.3.dev8py3-none-any.whl → 0.0.3.dev9py3-none-any.whl