outleap 0.5.1__py3-none-any.whl → 0.6.1__py3-none-any.whl

outleap/client.py

@@ -105,7 +105,7 @@ class LEAPClient:
 
         # Should naturally stop on its own when disconnect is called by virtue of
         # the incomplete read.
-        self._msg_pump_task = asyncio.get_event_loop().create_task(_pump_messages_forever())
+        self._msg_pump_task = asyncio.create_task(_pump_messages_forever())
 
     def disconnect(self) -> None:
         """Close the connection and clean up any pending request futures"""

outleap/protocol.py

@@ -23,6 +23,30 @@ class AbstractLEAPProtocol(abc.ABC):
         pass
 
 
+LLSD_PARSE_FUNC = Callable[[bytes], Any]
+
+
+# Python uses one, C++ uses the other, and everyone's unhappy.
+_BINARY_HEADERS = (b"<? LLSD/Binary ?>", b"<?llsd/binary?>")
+
+
+def parse_llsd(something: bytes) -> Any:
+    # We need a special parser to remove indra's binary LLSD prefix.
+    try:
+        something = something.lstrip()  # remove any pre-trailing whitespace
+        if any(something.startswith(x) for x in _BINARY_HEADERS):
+            return llsd.parse_binary(something.split(b"\n", 1)[1])
+        # This should be better.
+        elif llsd.starts_with(b"<", something):
+            return llsd.parse_xml(something)
+        else:
+            return llsd.parse_notation(something)
+    except KeyError as e:
+        raise llsd.LLSDParseError("LLSD could not be parsed: %s" % (e,))
+    except TypeError as e:
+        raise llsd.LLSDParseError("Input stream not of type bytes. %s" % (e,))
+
+
 class LEAPProtocol(AbstractLEAPProtocol):
     """Wrapper for communication with a LEAP peer over an asyncio reader/writer pair"""
 
@@ -31,7 +55,9 @@ class LEAPProtocol(AbstractLEAPProtocol):
     def __init__(self, reader: asyncio.StreamReader, writer: asyncio.StreamWriter):
         self._reader = reader
         self._writer = writer
-        self._parser = llsd.serde_notation.LLSDNotationParser()
+        # We could receive any kind of LLSD, so we have to use a parser that
+        # can handle anything via content type sniffing.
+        self._parser: LLSD_PARSE_FUNC = parse_llsd
         self._formatter = llsd.serde_notation.LLSDNotationFormatter()
         self._drain_task = None
 
@@ -74,7 +100,7 @@ class LEAPProtocol(AbstractLEAPProtocol):
         if length > self.PAYLOAD_LIMIT:
             raise ValueError(f"Unreasonable LEAP payload length of {length}")
         # Everything after the colon is LLSD
-        parsed = self._parser.parse(await self._reader.readexactly(length))
+        parsed = self._parser(await self._reader.readexactly(length))
         if not isinstance(parsed, dict):
             raise ValueError(f"Expected LEAP message to be a dict, got {parsed!r}")
         return parsed

outleap/scripts/agent.py

@@ -48,8 +48,7 @@ async def amain():
 
 
 def agent_main():
-    loop = asyncio.get_event_loop_policy().get_event_loop()
-    loop.run_until_complete(amain())
+    asyncio.run(amain())
 
 
 if __name__ == "__main__":

outleap/scripts/inspector.py

@@ -44,13 +44,15 @@ def temp_file_path():
             os.remove(f.name)
 
 
-def _calc_clipped_rect(pix: QtGui.QPixmap, elem: outleap.UIElement) -> QtCore.QRect:
-    base_rect = _elem_rect_to_qrect(pix, elem.rect)
+def _calc_clipped_rect(
+    pix: QtGui.QPixmap, elem: outleap.UIElement, scale_factor: float = 1.0
+) -> QtCore.QRect:
+    base_rect = _elem_rect_to_qrect(pix, elem.rect * scale_factor)
     while elem := elem.parent:
         # Should also be clipped to the intersection of all parent rects,
         # some scrollers have offscreen rects that can't really be shown
         # in a screenshot.
-        parent_rect = _elem_rect_to_qrect(pix, elem.rect)
+        parent_rect = _elem_rect_to_qrect(pix, elem.rect * scale_factor)
         base_rect = base_rect.intersected(parent_rect)
     return base_rect
 
@@ -86,8 +88,9 @@ class LEAPInspectorGUI(QtWidgets.QMainWindow):
         self._filter = ""
 
         self.interaction_manager = GUIInteractionManager(self)
-        self.window_api = outleap.LLWindowAPI(client)
+        self.window_api = outleap.LLWindowAPI(self.client)
         self.viewer_window_api = outleap.LLViewerWindowAPI(self.client)
+        self.viewer_control_api = outleap.LLViewerControlAPI(self.client)
         self._element_tree = outleap.UIElementTree(self.window_api)
         self._items_by_path: Dict[UIPath, QtWidgets.QTreeWidgetItem] = weakref.WeakValueDictionary()  # noqa
 
@@ -192,6 +195,9 @@ class LEAPInspectorGUI(QtWidgets.QMainWindow):
             self._addChildren(node.children, item)
         parent.addChildren(items)
 
+    async def _getUIScaleFactor(self) -> float:
+        return (await self.viewer_control_api.get("Global", "UIScaleFactor"))["value"]
+
     @asyncSlot()
     async def updateSelectedElemInfo(self, *args):
         self.textElemProperties.setPlainText("")
@@ -228,7 +234,7 @@ class LEAPInspectorGUI(QtWidgets.QMainWindow):
             pix_screenshot.load(path)
 
         # Clip scene and view to elem rect
-        scene_rect = _calc_clipped_rect(pix_screenshot, elem)
+        scene_rect = _calc_clipped_rect(pix_screenshot, elem, await self._getUIScaleFactor())
         self.sceneElemScreenshot.addPixmap(pix_screenshot)
         self.sceneElemScreenshot.setSceneRect(scene_rect)
         self.graphicsElemScreenshot.fitInView(scene_rect, QtCore.Qt.KeepAspectRatio)
@@ -251,7 +257,8 @@ class LEAPInspectorGUI(QtWidgets.QMainWindow):
             await self.viewer_window_api.save_snapshot(path)
             pix_screenshot.load(path)
         # Make a clipped copy of the screenshot
-        clipped = pix_screenshot.copy(_calc_clipped_rect(pix_screenshot, elem))
+        scale_factor = await self._getUIScaleFactor()
+        clipped = pix_screenshot.copy(_calc_clipped_rect(pix_screenshot, elem, scale_factor))
 
         file_name = await self.interaction_manager.save_file(
             caption="Save Rendered Element", filter_str="PNG Images (*.png)", default_suffix="png"

outleap/scripts/repl.py

@@ -50,7 +50,7 @@ class REPLServer:
 
 def repl_main():
     logging.basicConfig()
-    loop = asyncio.get_event_loop_policy().get_event_loop()
+    loop = asyncio.new_event_loop()
     repl_server = REPLServer()
     server = outleap.LEAPBridgeServer(repl_server.client_connected)
     coro = asyncio.start_server(server.handle_connection, "127.0.0.1", 9063)

outleap/ui_elems.py

@@ -102,6 +102,11 @@ class UIRect(NamedTuple):
     right: int
     top: int
 
+    def __mul__(self, factor: float) -> UIRect:
+        return UIRect(
+            *map(round, (self.bottom * factor, self.left * factor, self.right * factor, self.top * factor))
+        )
+
 
 @dataclasses.dataclass
 class UIElementInfo:

outleap/utils.py

@@ -82,7 +82,7 @@ async def _make_hacky_threaded_stdio_rw() -> Tuple[asyncio.StreamReader, asyncio
     #
     # TODO: Currently we also use this if we're reading from a non-pipe file descriptor on POSIX
     #  platforms, but that's probably unnecessary.
-    loop = asyncio.get_event_loop()
+    loop = asyncio.get_running_loop()
     reader = asyncio.StreamReader(limit=_READER_BUFFER_LIMIT)
     protocol = HackySTDIOProtocol()
     transport = HackySTDIOTransport()
@@ -157,7 +157,7 @@ async def connect_stdin_stdout() -> Tuple[asyncio.StreamReader, asyncio.StreamWr
             need_stdin_hack = True
     if need_stdin_hack:
         return await _make_hacky_threaded_stdio_rw()
-    loop = asyncio.get_event_loop()
+    loop = asyncio.get_running_loop()
     reader = asyncio.StreamReader(limit=_READER_BUFFER_LIMIT)
     protocol = asyncio.StreamReaderProtocol(reader)
     await loop.connect_read_pipe(lambda: protocol, sys.stdin)

outleap/version.py

@@ -5,7 +5,7 @@ from collections import namedtuple
 #: A namedtuple of the version info for the current release.
 _version_info = namedtuple("_version_info", "major minor micro status")
 
-parts = "0.5.1".split(".", 3)
+parts = "0.6.1".split(".", 3)
 version_info = _version_info(
     int(parts[0]),
     int(parts[1]),
@@ -16,4 +16,4 @@ version_info = _version_info(
 # Remove everything but the 'version_info' from this module.
 del namedtuple, _version_info, parts
 
-__version__ = "0.5.1"
+__version__ = "0.6.1"

{outleap-0.5.1.dist-info → outleap-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: outleap
-Version: 0.5.1
+Version: 0.6.1
 Summary: Tools for using asyncio to control a Second Life viewer over the LEAP protocol
 Author-email: Salad Dais <83434023+SaladDais@users.noreply.github.com>
 License: MIT License
@@ -15,11 +15,15 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: llsd
+License-File: COPYING
+Requires-Dist: llsd ==1.0.0
+Requires-Dist: setuptools
 Provides-Extra: tools
-Requires-Dist: ptpython (<4,>=3) ; extra == 'tools'
+Requires-Dist: ptpython <4,>=3 ; extra == 'tools'
 Requires-Dist: qasync ; extra == 'tools'
 Requires-Dist: pyside6-essentials ; extra == 'tools'
 
@@ -59,8 +63,7 @@ async def amain():
         print(await viewer_control_api.get("Global", "StatsPilotFile"), file=sys.stderr)
 
 
-loop = asyncio.get_event_loop_policy().get_event_loop()
-loop.run_until_complete(amain())
+asyncio.run(amain())
 ```
 
 If you just want to play around with the LEAP APIs:

outleap-0.6.1.dist-info/RECORD

@@ -0,0 +1,20 @@
+outleap/__init__.py,sha256=h0VTP95rggZ-iFH1Ke4rh85fiU3BTvfj_jkLW27Ln1k,689
+outleap/api_wrappers.py,sha256=Ch3igDgvgjft2NcMbFlp9fwt3rsGenqsPyI6Kme6W58,17434
+outleap/bridge.py,sha256=Q5tku2JP-K0wT9zVA8OyJpFEpumgbUgHaC1YeRQR8vE,1016
+outleap/client.py,sha256=I-hVicIEBKcfZBRuG3hQUO-N-pbmfLECQfpLl7323IQ,14404
+outleap/protocol.py,sha256=HeCnlzszGp6Yxgq__34KYYuii6tpxnfUi5La9SFxw0k,3725
+outleap/qt_helpers.py,sha256=qpdEx7y60T3nAJ4GFDvpcefKEgpgBBnt8dQ-c2IB-Zc,7766
+outleap/ui_elems.py,sha256=ndi3FDp_fu1rVD3rNpFp6hs8eU53U4D_dCtuwFmums0,11577
+outleap/utils.py,sha256=Ad1-mAU0ButNp8n4KeXQxxNa7AtFRuZWD5L2RVS5vLM,5863
+outleap/version.py,sha256=QgdOd1nYQiSrjWXxPqJWSY5Vb7JsM1XNJYCbm7I4OE4,517
+outleap/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+outleap/scripts/agent.py,sha256=Z_blVpeZ8JH6gv1M3_Wq8iCXxgdikTgAu7JEpx-Uxfk,1983
+outleap/scripts/inspector.py,sha256=dNBk9i6kKuueZ7Jk5jEc_1cQ5vy9EY8ZL80oZHA8HMo,10991
+outleap/scripts/repl.py,sha256=BC49hGBkshTRdKtzHM7Hos6nHSFq-cLV_Sw7swjqXTA,1720
+outleap/scripts/ui/inspector.ui,sha256=CY-Tczsrpmc2groE6_7s_fIc7de6Oy2TuU2a4ZGzl7o,7269
+outleap-0.6.1.dist-info/COPYING,sha256=OPIPYHZUdL5ylRYaujIVg05CSvX4-AHW15qBGYz_fyY,1093
+outleap-0.6.1.dist-info/METADATA,sha256=gKfDJWk4bSqjbMFbqA1NExKtTgtJn1eks17_b1RhJJQ,4802
+outleap-0.6.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+outleap-0.6.1.dist-info/entry_points.txt,sha256=gi7UECBDlCTzn0jUU8xPvyMm_8lOQMZUJuNOe266I48,174
+outleap-0.6.1.dist-info/top_level.txt,sha256=dIQJmMy2IulmIzvBWuz8dup0dm9MV0b4p_hCtBRewfE,8
+outleap-0.6.1.dist-info/RECORD,,

{outleap-0.5.1.dist-info → outleap-0.6.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

outleap-0.5.1.dist-info/RECORD

@@ -1,20 +0,0 @@
-outleap/__init__.py,sha256=h0VTP95rggZ-iFH1Ke4rh85fiU3BTvfj_jkLW27Ln1k,689
-outleap/api_wrappers.py,sha256=Ch3igDgvgjft2NcMbFlp9fwt3rsGenqsPyI6Kme6W58,17434
-outleap/bridge.py,sha256=Q5tku2JP-K0wT9zVA8OyJpFEpumgbUgHaC1YeRQR8vE,1016
-outleap/client.py,sha256=tM6SrGSSMuZ2bS7Py_3Tn-KbLx-JZB7zKFB5C3f3umQ,14421
-outleap/protocol.py,sha256=dFIE-tnHMUPlr5u8AnSm-WA55e8QIsWeQ5MJSACgVA4,2715
-outleap/qt_helpers.py,sha256=qpdEx7y60T3nAJ4GFDvpcefKEgpgBBnt8dQ-c2IB-Zc,7766
-outleap/ui_elems.py,sha256=Jq3KkpnvLH_Hh0-fzHkVbmauHoVguwV4ySHa-EsroAE,11387
-outleap/utils.py,sha256=RkovmLsFsmdOSI3Cw_uGVhve58nh9TABFfiwKDhnFvQ,5859
-outleap/version.py,sha256=MvOGqIQegsePzZXtW6-YCEVXqWZLgy7240EJScwKvDc,517
-outleap/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-outleap/scripts/agent.py,sha256=9wJM9pSjKihsbX3C0B07n9T5BuU9aiivOXMVItY95eg,2055
-outleap/scripts/inspector.py,sha256=87sEi8Wt1QLyaxCEQR98ZknQupbi1uMYgY5f9Vfou04,10613
-outleap/scripts/repl.py,sha256=TAvemMlhdJSqDDL6mqDvSlAerBk25deKYx-s-W0T8z0,1744
-outleap/scripts/ui/inspector.ui,sha256=CY-Tczsrpmc2groE6_7s_fIc7de6Oy2TuU2a4ZGzl7o,7269
-outleap-0.5.1.dist-info/COPYING,sha256=OPIPYHZUdL5ylRYaujIVg05CSvX4-AHW15qBGYz_fyY,1093
-outleap-0.5.1.dist-info/METADATA,sha256=EjHcAq3BAuNXzmO0DaMXZz2N5b3p3c6-ZdZgLdxZ74s,4714
-outleap-0.5.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-outleap-0.5.1.dist-info/entry_points.txt,sha256=gi7UECBDlCTzn0jUU8xPvyMm_8lOQMZUJuNOe266I48,174
-outleap-0.5.1.dist-info/top_level.txt,sha256=dIQJmMy2IulmIzvBWuz8dup0dm9MV0b4p_hCtBRewfE,8
-outleap-0.5.1.dist-info/RECORD,,