Merge branch 'main' into andrew/mac-subprocess-fix

Author: ayjayt

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
       - name: Install Dependencies
         run:  sudo apt-get update && sudo apt-get install chromium-browser
       - name: Install devtools
-        run:  ls && pip install .[dev] numpy
+        run:  ls && pip install .[dev]
       - name: diagnostic
         run:  dtdoctor
         timeout-minutes: 1
@@ -24,7 +24,7 @@ jobs:
       - name: Install Dependencies
         run:  choco install googlechrome -y --ignore-checksums
       - name: Install devtools
-        run:  pip install .[dev] numpy
+        run:  pip install .[dev]
       - name: diagnostic
         run:  dtdoctor
         timeout-minutes: 1
@@ -39,7 +39,7 @@ jobs:
       - name: Install Dependencies
         run:  brew install google-chrome
       - name: Install devtools
-        run:  pip install .[dev] numpy
+        run:  pip install .[dev]
       - name: diagnostic
         run:  dtdoctor
         timeout-minutes: 1

README.md

@@ -6,14 +6,13 @@
 
 ### ⚠️⚠️⚠️**Testers Needed!**⚠️⚠️⚠️
 
-**This package is cross-platform and testing on _many various platforms_ will help us! See [here](#%EF%B8%8F-help-needed-%EF%B8%8F).**
-
+Please install this repo with `pip` (`pip install .`) and run `dtdoctor`, pasting the output in an issue or to slack!
 
 ## Quickstart (asyncio)
 
 Easy:
 ```python
-import asyncio
+import asyncio # required for this example only
 import devtools
 
 
@@ -22,6 +21,15 @@ async with Browser(headless=False) as browser:
 	await asyncio.sleep(3)
 	await new_tab.send_command("Page.navigate", params=dict(url="https://github.com"))
 	await asyncio.sleep(3)
+
+
+## NOTE:
+# if you wish to use interactively, ie in a console,
+# it is better to use, instead of `async with`:
+
+browser = await Browser(headless=False)
+
+# as exiting the context will close the browser
 ```
 
 See [the devtools reference](https://chromedevtools.github.io/devtools-protocol/) for a list of all possible commands.
@@ -45,38 +53,22 @@ See [the devtools reference](https://chromedevtools.github.io/devtools-protocol/
 	reponse = await new_tab.subscribe_once("Page.lifecycleEvent")
 	# do something with response
 	browser.unsubscribe("Target.*")
-	# events are always sent to a browser or tab, but the documentation isn't always clear which
-	# so dumping all: `browser.subscribe("*", dump_event)` can be useful (but verbose) for debugging
+	# events are always sent to a browser or tab,
+  # but the documentation isn't always clear which.
+	# Dumping all: `browser.subscribe("*", dump_event)` (on tab too)
+  # can be useful (but verbose) for debugging.
 ```
-Install this repository (`pip install .`) and `numpy`.
 
 ## Other Options
 
 ### Non-asyncio
 
 You can use this library without `asyncio`,
 ```
-my_browser = devtools.Browser()
+my_browser = devtools.Browser() # blocking until open
 ```
 But you are responsible for calling all `browser.pipe.read_jsons(blocking=True|False)` and organizing the results. `browser.run_output_thread()` will start a second thread that constantly prints all responses from the browser, it can't be used with `asyncio`- it won't play nice with any other read.
 
 ### Low-level use
 
 We provide a `Browser` and `Tab` interface, but there is also a lower-level `Target` and `Session` interface that one can use if needed.
-
---------------------------
---------------------------
---------------------------
---------------------------
-# ⚠️ Help Needed! ⚠️
-
-### First Test
-
-Please run: `python app/test1.py` and send me the output along with information about your browser, operating system, and python. Internal plotly slack is fine #kaleido, or a github issue is also fine.
-
-#### Optional Tests
-
-Run: `app/app.py` and send me the output.
-
-If everything works, feel free to give `kaleido/app.py` a shot.
-

devtools/pipe.py

@@ -4,22 +4,29 @@
 import platform
 import warnings
 
-import numpy as np
-
 with_block = bool(sys.version_info[:3] >= (3, 12) or platform.system() != "Windows")
 class BlockWarning(UserWarning):
     pass
 
 # TODO: don't know about this
 # TODO: use has_attr instead of np.integer, you'll be fine
 class NumpyEncoder(json.JSONEncoder):
-    """ Special json encoder for numpy types """
+    """Special json encoder for numpy types"""
+
     def default(self, obj):
-        if isinstance(obj, np.integer):
+        if (
+            hasattr(obj, "dtype")
+            and obj.dtype.kind == "i"
+            and obj.shape == ()
+        ):
             return int(obj)
-        elif isinstance(obj, np.floating):
+        elif (
+            hasattr(obj, "dtype")
+            and obj.dtype.kind == "f"
+            and obj.shape == ()
+        ):
             return float(obj)
-        elif isinstance(obj, np.ndarray):
+        elif hasattr(obj, "dtype") and obj.shape != ():
             return obj.tolist()
         return json.JSONEncoder.default(self, obj)
 

devtools/target.py

@@ -76,7 +76,7 @@ def _get_first_session(self):
             )
         return list(self.sessions.values())[0]
 
-    def subscribe(self, string, callback, repeating):
+    def subscribe(self, string, callback, repeating=True):
         session = self._get_first_session()
         session.subscribe(string, callback, repeating)