FIX light refactoring and input reorder

Author: eleniv3d

deps/eigen

@@ -16,11 +16,14 @@ def RunScript(self,
             i_load: bool,
             i_ply_url: str):
 
-        sc.sticky.setdefault('ply_url', None) #last url processed
-        sc.sticky.setdefault('imported_geom', None) #geo imported from ply
-        sc.sticky.setdefault('status_message','Idle') #status message on component
-        sc.sticky.setdefault('prev_load', False) #previous state of toggle
-        sc.sticky.setdefault('thread_running', False) #is an import thread active?
+        prefix = 'http'
+
+        # initialize sticky variables
+        sc.sticky.setdefault(f'{prefix}_ply_url', None)  # last url processed
+        sc.sticky.setdefault(f'{prefix}_imported_geom', None)  # last geo imported from ply
+        sc.sticky.setdefault(f'{prefix}_status_message', "Waiting..")  # status message on component
+        sc.sticky.setdefault(f'{prefix}_prev_load', False)  # previous state of toggle
+        sc.sticky.setdefault(f'{prefix}_thread_running', False)  # is a background thread running?
 
         def _import_job(url):
             """
@@ -30,7 +33,10 @@ def _import_job(url):
             - Extracts the new geometry (point cloud or mesh)
             - Cleans up the temporary file and document objects
             - Updates sticky state and status message
+            - Signals to GH that it should re-solve
             """
+
+            tmp = None
             try:
                 if not url.lower().endswith('.ply'):
                     raise ValueError("URL must end in .ply")
@@ -71,43 +77,43 @@ def _import_job(url):
                 doc.Views.Redraw()
 
                 # store new geometry
-                sc.sticky['imported_geom']  = geom
+                sc.sticky[f'{prefix}_imported_geom'] = geom
                 count = geom.Count if isinstance(geom, rg.PointCloud) else geom.Vertices.Count
                 if isinstance(geom, rg.PointCloud):
-                    sc.sticky['status_message'] = f"Done: {count} points"
+                    sc.sticky[f'{prefix}_status_message'] = f"Loaded pcd with {count} pts"
                 else:
-                    sc.sticky['status_message'] = f"Done: {count} vertices"
-                ghenv.Component.Message = sc.sticky.get('status_message')  # noqa: F821
+                    sc.sticky[f'{prefix}_status_message'] = f"Loaded mesh wih {count} vertices"
+                ghenv.Component.Message = sc.sticky.get(f'{prefix}_status_message')  # noqa: F821
 
             except Exception as e:
-                sc.sticky['imported_geom'] = None
-                sc.sticky['status_message'] = f"Error: {e}"
+                sc.sticky[f'{prefix}_imported_geom'] = None
+                sc.sticky[f'{prefix}_status_message'] = f"Error: {e}"
             finally:
                 try:
                     os.remove(tmp)
                 except Exception:
                     pass
                 # mark thread as finished
-                sc.sticky['thread_running'] = False
+                sc.sticky[f'{prefix}_thread_running'] = False
                 ghenv.Component.ExpireSolution(True)  # noqa: F821
 
         # check if the URL input has changed
-        if sc.sticky['ply_url'] != i_ply_url:
-            sc.sticky['ply_url'] = i_ply_url
-            sc.sticky['status_message'] = "URL changed. Press Load"
-            sc.sticky['thread_running'] = False
-            sc.sticky['prev_load'] = False
+        if sc.sticky[f'{prefix}_ply_url'] != i_ply_url:
+            sc.sticky[f'{prefix}_ply_url'] = i_ply_url
+            sc.sticky[f'{prefix}_status_message'] = "URL changed. Press Load"
+            sc.sticky[f'{prefix}_thread_running'] = False
+            sc.sticky[f'{prefix}_prev_load'] = False
 
         # start importing if Load toggle is pressed and import thread is not already running
-        if i_load and not sc.sticky['prev_load'] and not sc.sticky['thread_running']:
-            sc.sticky['status_message'] = "Loading..."
-            sc.sticky['thread_running'] = True
+        if i_load and not sc.sticky[f'{prefix}_prev_load'] and not sc.sticky[f'{prefix}_thread_running']:
+            sc.sticky[f'{prefix}_status_message'] = "Loading..."
+            sc.sticky[f'{prefix}_thread_running'] = True
             threading.Thread(target=_import_job, args=(i_ply_url,), daemon=True).start()
 
-        sc.sticky['prev_load'] = i_load
-        ghenv.Component.Message = sc.sticky.get('status_message', "")  # noqa: F821
+        sc.sticky[f'{prefix}_prev_load'] = i_load
+        ghenv.Component.Message = sc.sticky.get(f'{prefix}_status_message', "")  # noqa: F821
 
         # output
-        o_geometry = sc.sticky.get('imported_geom')
+        o_geometry = sc.sticky.get(f'{prefix}_imported_geom')
 
         return [o_geometry]

deps/pybind11

@@ -12,21 +12,22 @@
 class DFTCPListener(component):
     def RunScript(self,
             i_start: bool,
-            i_load: bool,
             i_stop: bool,
-            i_port: int,
-            i_host: str):
+            i_load: bool,
+            i_host: str,
+            i_port: int):
+
+        prefix = 'tcp'
 
-        # Sticky defaults
-        sc.sticky.setdefault('server_sock', None)
-        sc.sticky.setdefault('server_started', False)
-        sc.sticky.setdefault('cloud_buffer_raw', [])
-        sc.sticky.setdefault('latest_cloud', None)
-        sc.sticky.setdefault('status_message', 'Waiting...')
-        sc.sticky.setdefault('prev_start', False)
-        sc.sticky.setdefault('prev_stop', False)
-        sc.sticky.setdefault('prev_load', False)
-        sc.sticky.setdefault('client_socks', [])        # Track client sockets
+        # Sticky initialization
+        sc.sticky.setdefault(f'{prefix}_server_sock', None)
+        sc.sticky.setdefault(f'{prefix}_server_started', False)
+        sc.sticky.setdefault(f'{prefix}_cloud_buffer_raw', [])
+        sc.sticky.setdefault(f'{prefix}_latest_cloud', None)
+        sc.sticky.setdefault(f'{prefix}_status_message', 'Waiting..')
+        sc.sticky.setdefault(f'{prefix}_prev_start', False)
+        sc.sticky.setdefault(f'{prefix}_prev_stop', False)
+        sc.sticky.setdefault(f'{prefix}_prev_load', False)
 
         # Client handler
         def handle_client(conn):
@@ -35,7 +36,7 @@ def handle_client(conn):
             """
             buf = b''
             with conn:
-                while sc.sticky.get('server_started', False):
+                while sc.sticky.get(f'{prefix}_server_started', False):
                     try:
                         chunk = conn.recv(4096)
                         if not chunk:
@@ -48,7 +49,7 @@ def handle_client(conn):
                             except Exception:
                                 continue
                             if isinstance(raw, list) and all(isinstance(pt, list) and len(pt) == 6 for pt in raw):
-                                sc.sticky['cloud_buffer_raw'] = raw
+                                sc.sticky[f'{prefix}_cloud_buffer_raw'] = raw
                     except Exception:
                         break
 
@@ -73,49 +74,49 @@ def start_server():
             sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
             sock.bind((i_host, i_port))
             sock.listen(1)
-            sc.sticky['server_sock'] = sock
-            sc.sticky['server_started'] = True
-            sc.sticky['status_message'] = f'Listening on {i_host}:{i_port}'
+            sc.sticky[f'{prefix}_server_sock'] = sock
+            sc.sticky[f'{prefix}_server_started'] = True
+            sc.sticky[f'{prefix}_status_message'] = f'Listening on {i_host}:{i_port}'
             # Only accept one connection to keep it long-lived
             threading.Thread(target=server_loop, args=(sock,), daemon=True).start()
 
         def stop_server():
-            sock = sc.sticky.get('server_sock')
+            sock = sc.sticky.get(f'{prefix}_server_sock')
             if sock:
                 try:
                     sock.close()
                 except Exception:
                     pass
-            sc.sticky['server_sock'] = None
-            sc.sticky['server_started'] = False
-            sc.sticky['cloud_buffer_raw'] = []
-            sc.sticky['status_message'] = 'Stopped'
+            sc.sticky[f'{prefix}_server_sock'] = None
+            sc.sticky[f'{prefix}_server_started'] = False
+            sc.sticky[f'{prefix}_cloud_buffer_raw'] = []
+            sc.sticky[f'{prefix}_status_message'] = 'Stopped'
 
         # Start or stop server based on inputs
-        if i_start and not sc.sticky['prev_start']:
+        if i_start and not sc.sticky[f'{prefix}_prev_start']:
             start_server()
-        if i_stop and not sc.sticky['prev_stop']:
+        if i_stop and not sc.sticky[f'{prefix}_prev_stop']:
             stop_server()
 
-        # Load buffered points into PointCloud
-        if i_load and not sc.sticky['prev_load']:
-            raw = sc.sticky.get('cloud_buffer_raw', [])
+        # Load buffered points into Rhino PointCloud
+        if i_load and not sc.sticky[f'{prefix}_prev_load']:
+            raw = sc.sticky.get(f'{prefix}_cloud_buffer_raw', [])
             if raw:
                 pc = rg.PointCloud()
                 for x, y, z, r, g, b in raw:
                     pc.Add(rg.Point3d(x, y, z), sd.Color.FromArgb(int(r), int(g), int(b)))
-                sc.sticky['latest_cloud'] = pc
-                sc.sticky['status_message'] = f'Retrieved {pc.Count} pts'
+                sc.sticky[f'{prefix}_latest_cloud'] = pc
+                sc.sticky[f'{prefix}_status_message'] = f'Loaded pcd with {pc.Count} pts'
             else:
-                sc.sticky['status_message'] = 'No data buffered'
+                sc.sticky[f'{prefix}_status_message'] = 'No data buffered'
 
         # Update previous states
-        sc.sticky['prev_start'] = i_start
-        sc.sticky['prev_stop'] = i_stop
-        sc.sticky['prev_load'] = i_load
+        sc.sticky[f'{prefix}_prev_start'] = i_start
+        sc.sticky[f'{prefix}_prev_stop'] = i_stop
+        sc.sticky[f'{prefix}_prev_load'] = i_load
 
         # Update UI and output
-        ghenv.Component.Message = sc.sticky['status_message']  # noqa: F821
+        ghenv.Component.Message = sc.sticky[f'{prefix}_status_message']  # noqa: F821
 
-        o_cloud = sc.sticky['latest_cloud']
+        o_cloud = sc.sticky[f'{prefix}_latest_cloud']
         return [o_cloud]

src/gh/components/DF_http_listener/code.py

@@ -3,7 +3,7 @@
     "nickname": "TCPIn",
     "category": "diffCheck",
     "subcategory": "IO",
-    "description": "This component get data from a tcp sender",
+    "description": "This component get point cloud data from a tcp sender",
     "exposure": 4,
     "instanceGuid": "61a9cc27-864d-4892-bd39-5d97dbccbefb",
     "ghpython": {
@@ -26,9 +26,9 @@
                 "typeHintID": "bool"
             },
             {
-                "name": "i_load",
-                "nickname": "i_load",
-                "description": "Button to get the latest PCD from the buffer",
+                "name": "i_stop",
+                "nickname": "i_stop",
+                "description": "Button to stop the server and release the port",
                 "optional": true,
                 "allowTreeAccess": true,
                 "showTypeHints": true,
@@ -38,9 +38,9 @@
                 "typeHintID": "bool"
             },
             {
-                "name": "i_stop",
-                "nickname": "i_stop",
-                "description": "Stop the server and release the port",
+                "name": "i_load",
+                "nickname": "i_load",
+                "description": "Button to get the latest PCD from the buffer",
                 "optional": true,
                 "allowTreeAccess": true,
                 "showTypeHints": true,
@@ -50,35 +50,35 @@
                 "typeHintID": "bool"
             },
             {
-                "name": "i_port",
-                "nickname": "i_port",
-                "description": "The port for the connection",
+                "name": "i_host",
+                "nickname": "i_host",
+                "description": "The host to use for the connection",
                 "optional": true,
                 "allowTreeAccess": true,
                 "showTypeHints": true,
                 "scriptParamAccess": "item",
                 "wireDisplay": "default",
                 "sourceCount": 0,
-                "typeHintID": "int"
+                "typeHintID": "str"
             },
             {
-                "name": "i_host",
-                "nickname": "i_host",
-                "description": "The host for the connection",
+                "name": "i_port",
+                "nickname": "i_port",
+                "description": "The port to use for the connection",
                 "optional": true,
                 "allowTreeAccess": true,
                 "showTypeHints": true,
                 "scriptParamAccess": "item",
                 "wireDisplay": "default",
                 "sourceCount": 0,
-                "typeHintID": "str"
+                "typeHintID": "int"
             }
         ],
         "outputParameters": [
             {
                 "name": "o_cloud",
                 "nickname": "o_cloud",
-                "description": "The pcd that was received.",
+                "description": "The Rhino pcd that was received.",
                 "optional": false,
                 "sourceCount": 0,
                 "graft": false