Update for herethere 0.2.1 changes

Author: b3b

CHANGELOG.rst

@@ -1,6 +1,19 @@
 Changelog
 =========
 
+0.2.1
+-----
+
+* Updated ``herethere`` package to 0.2.1, adding ``%there get`` and
+  ``%there download`` commands
+* Fixed Android shortcut icon lookup for ``%there pin``
+* Fixed ``%there`` reliability issues in notebooks, including event loop
+  handling, port reuse after server shutdown, and cleanup behavior
+* Improved Docker JupyterLab defaults
+* Separated Android package names:
+  ``me.herethere.pythonhere`` for releases and
+  ``me.herethere.pythonhere_dev`` for source/self-built builds
+
 0.2.0
 -----
 

README.rst

@@ -16,7 +16,7 @@ PythonHere
     :alt: Supported Python versions
 .. image:: https://github.com/b3b/pythonhere/actions/workflows/tests.yml/badge.svg?branch=master
    :target: https://github.com/b3b/pythonhere/actions/workflows/tests.yml?query=branch%3Amaster
-   :alt: CI Status          
+   :alt: CI Status
 .. image:: https://codecov.io/github/b3b/pythonhere/coverage.svg?branch=master
     :target: https://codecov.io/github/b3b/pythonhere?branch=master
     :alt: Code coverage Status
@@ -44,6 +44,9 @@ Project documentation: https://herethere.me/pythonhere
 Install the Android app
 -----------------------
 
+Install *PythonHere* with `Obtainium <https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://github.com/b3b/pythonhere>`_
+to receive updates from GitHub Releases.
+
 Ready-to-use *PythonHere* APKs are available from the `GitHub Releases <https://github.com/b3b/pythonhere/releases>`_ page.
 
 For APK provenance and signing checks, see `Android APK verification <https://github.com/b3b/pythonhere/blob/master/docs/android-apk-verification.rst>`_.

buildozer.spec

@@ -37,7 +37,7 @@ requirements =
              # herethere dependencies
              asyncssh==2.23.0,
              python-dotenv==1.2.2,
-             herethere,
+             herethere==0.2.1,
              # asyncssh dependencies
              cryptography,
              typing_extensions,

pyproject.toml

@@ -22,7 +22,7 @@ classifiers = [
     "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-    "herethere[magic]>=0.1.0",
+    "herethere[magic]>=0.2.1",
     "ipython",
     "ipywidgets",
     "Pillow",
@@ -36,7 +36,6 @@ dev = [
     "docutils",
     "ifaddr",
     "kivy==2.3.1",
-    "nest-asyncio2==1.7.2",
     "pylint",
     "pytest",
     "pytest-asyncio",
@@ -60,6 +59,7 @@ environments = [
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
+pythonpath = ["pythonhere"]
 
 [tool.setuptools]
 packages = [

pythonhere/server_here.py

@@ -30,7 +30,7 @@ async def run_ssh_server(app):
         try:
             config = ServerConfig(
                 host="",
-                chroot=app.upload_dir,
+                sftp_root=app.upload_dir,
                 key_path=Path("./key.rsa").resolve(),
                 **app.get_pythonhere_config(),
             )

tests/conftest.py

@@ -1,38 +1,53 @@
 import asyncio
 import os
 import sys
+import types
 from contextlib import suppress
 from pathlib import Path
 
-import nest_asyncio2
 import pytest
 from asyncssh import PermissionDenied
 from herethere.everywhere import ConnectionConfig
+from herethere.everywhere.loop import run_sync
 from herethere.there.client import Client
 from herethere.there.commands import ContextObject, there_group
 from kivy.config import Config
 from kivy.core.window import Window
 from main import PythonHereApp, run_ssh_server
 
 
+async def run_herethere_sync(awaitable):
+    """Run sync magic work while the in-process SSH server keeps its test loop.
+
+    Use this only for code paths that exercise herethere's synchronous magic
+    bridge. Plain async client tests should await the client API directly.
+    """
+    return await asyncio.to_thread(run_sync, awaitable)
+
+
 @pytest.fixture
-def connection_config():
+def connection_config(app_config):
     return ConnectionConfig(
         host="localhost",
-        port=8022,
+        port=app_config,
         username="here",
         password="there",
     )
 
 
 @pytest.fixture
-def app_config():
-    Config.read("../tests/config.ini")
+def app_config(unused_tcp_port):
+    Config.read(str(Path(__file__).with_name("config.ini")))
+    Config.set("pythonhere", "port", str(unused_tcp_port))
+    return unused_tcp_port
 
 
 @pytest.fixture
 async def app_instance(mocker, capfd, app_config, tmpdir):
+    original_cwd = Path.cwd()
+    os.chdir(Path(__file__).parents[1] / "pythonhere")
     mocker.patch("main.App.user_data_dir", tmpdir)
+    Window.size = (800, 600)
 
     app = PythonHereApp()
     app.init_asyncio_state()
@@ -54,6 +69,7 @@ async def app_instance(mocker, capfd, app_config, tmpdir):
             raise result
     app.root.clear_widgets()
     Window.children.clear()
+    os.chdir(original_cwd)
 
 
 @pytest.fixture
@@ -66,11 +82,37 @@ async def there(app_instance, connection_config):
     finally:
         connection = client.connection.connection
         await client.disconnect()
+
         if connection is not None:
             with suppress(Exception):
                 await connection.wait_closed()
 
 
+@pytest.fixture
+async def sync_there_client(app_instance, connection_config):
+    """Client connected on herethere's sync magic loop.
+
+    Use with command/magic helpers that call herethere.there.commands, because
+    those commands call run_sync() internally and expect the client connection
+    to belong to herethere's background magic loop.
+    """
+    client = Client()
+    await asyncio.wait_for(app_instance.ssh_server_started.wait(), 5)
+    await run_herethere_sync(client.connect(connection_config))
+    try:
+        yield client
+    finally:
+        connection = client.connection.connection
+        await run_herethere_sync(client.disconnect())
+
+        async def wait_closed():
+            if connection is not None:
+                await connection.wait_closed()
+
+        with suppress(Exception):
+            await run_herethere_sync(wait_closed())
+
+
 @pytest.fixture
 async def there_with_wrong_password(app_instance, connection_config):
     client = Client()
@@ -82,18 +124,21 @@ async def there_with_wrong_password(app_instance, connection_config):
 
 
 @pytest.fixture
-def nested_event_loop():
-    nest_asyncio2.apply()
+async def call_there_group(app_instance, sync_there_client):
+    """Call the synchronous %there command group from async tests.
 
+    The command itself is synchronous, so it is run in a worker thread. This
+    leaves pytest's event loop free to service the in-process PythonHere SSH
+    server which receives the command.
+    """
 
-@pytest.fixture
-async def call_there_group(nested_event_loop, app_instance, there):
-    def _callable(args, code):
-        there_group(
+    async def _callable(args, code):
+        return await asyncio.to_thread(
+            there_group,
             args,
             "test",
             standalone_mode=False,
-            obj=ContextObject(client=there, code=code),
+            obj=ContextObject(client=sync_there_client, code=code),
         )
 
     return _callable
@@ -112,8 +157,106 @@ def preserve_cwd():
 
 @pytest.fixture
 def mocked_android_modules(mocker):
-    sys.modules["jnius"] = mocker.Mock()
-    sys.modules["android"] = mocker.Mock()
+    """Install a small fake Android/Jnius surface for Android-only code paths.
+
+    Keep this fake narrow: add methods/constants here only when tests exercise
+    the corresponding behavior in android_here or launcher_here.
+    """
+    activity = mocker.Mock()
+    context = mocker.Mock()
+    app_info = mocker.Mock(icon=1)
+    manager = mocker.Mock()
+    manager.isRequestPinShortcutSupported.return_value = True
+    context.getApplicationInfo.return_value = app_info
+    activity.getApplicationContext.return_value = context
+    activity.getSystemService.return_value = manager
+
+    class Context:
+        SHORTCUT_SERVICE = "shortcut"
+
+    class Icon:
+        createWithResource = mocker.Mock(return_value=mocker.Mock())
+
+    class Intent:
+        FLAG_ACTIVITY_NEW_TASK = 1
+        FLAG_ACTIVITY_CLEAR_TASK = 2
+        ACTION_MAIN = "android.intent.action.MAIN"
+
+        def __init__(self, *args):
+            self.args = args
+            self.data = None
+            self.flags = None
+            self.action = None
+
+        def setAction(self, action):
+            self.action = action
+            return self
+
+        def setData(self, data):
+            self.data = data
+            return self
+
+        def setFlags(self, flags):
+            self.flags = flags
+            return self
+
+        def getData(self):
+            return self.data
+
+    class PythonActivity:
+        mActivity = activity
+
+    class ShortcutInfoBuilder:
+        def __init__(self, *args):
+            self.args = args
+
+        def setShortLabel(self, label):
+            self.short_label = label
+            return self
+
+        def setLongLabel(self, label):
+            self.long_label = label
+            return self
+
+        def setIntent(self, intent):
+            self.intent = intent
+            return self
+
+        def setIcon(self, icon):
+            self.icon = icon
+            return self
+
+        def build(self):
+            return self
+
+    class System:
+        exit = mocker.Mock()
+
+    class Uri:
+        @staticmethod
+        def parse(value):
+            uri = mocker.Mock()
+            uri.toString.return_value = value
+            return uri
+
+    classes = {
+        "android.content.Context": Context,
+        "android.graphics.drawable.Icon": Icon,
+        "android.content.Intent": Intent,
+        "org.kivy.android.PythonActivity": PythonActivity,
+        "android.content.pm.ShortcutInfo$Builder": ShortcutInfoBuilder,
+        "java.lang.System": System,
+        "android.net.Uri": Uri,
+    }
+
+    def autoclass(name):
+        return classes[name]
+
+    sys.modules["jnius"] = types.SimpleNamespace(
+        autoclass=autoclass,
+        cast=mocker.Mock(side_effect=lambda _class_name, obj: obj),
+    )
+    sys.modules["android"] = types.SimpleNamespace(activity=mocker.Mock())
 
 
 @pytest.fixture

tests/test_magic.py

@@ -10,7 +10,7 @@
 async def test_kv_command_runcode_called(call_there_group, mocker):
     runcode = mocker.patch.object(ContextObject, "runcode", autospec=True)
 
-    call_there_group(["kv"], "Label:")
+    await call_there_group(["kv"], "Label:")
 
     runcode.assert_called_once()
     ctx_obj = runcode.call_args[0][0]
@@ -20,41 +20,41 @@ async def test_kv_command_runcode_called(call_there_group, mocker):
 @pytest.mark.asyncio
 async def test_kv_command_executed(capfd, app_instance, call_there_group):
     assert not getattr(app_instance.root, "text", "")
-    call_there_group(["kv"], "Label:\n    text: '''Hello there'''")
+    await call_there_group(["kv"], "Label:\n    text: '''Hello there'''")
     captured = capfd.readouterr()
     assert not captured.out and not captured.err
     assert app_instance.root.text == "Hello there"
 
 
 @pytest.mark.asyncio
 async def test_screenshot_command_executed(app_instance, call_there_group):
-    call_there_group(["screenshot"], "")
+    await call_there_group(["screenshot"], "")
 
 
 @pytest.mark.asyncio
 async def test_screenshot_saved_to_file(tmpdir, app_instance, call_there_group):
     output = Path(tmpdir) / "test.png"
     assert not os.path.exists(output)
-    call_there_group(["screenshot", "-o", output], "")
+    await call_there_group(["screenshot", "-o", output], "")
     assert os.path.exists(output)
 
 
 @pytest.mark.asyncio
 async def test_screenshot_resized_to_width(tmpdir, app_instance, call_there_group):
     output = Path(tmpdir) / "test.png"
 
-    call_there_group(["screenshot", "--width", "100", "-o", output], "")
+    await call_there_group(["screenshot", "--width", "100", "-o", output], "")
 
     image = shortcuts.PILImage.open(output)
-    assert image.size == (100, 75)
+    assert image.size[0] == 100
 
 
 @pytest.mark.asyncio
 async def test_pin_command_pin_shortcut_called(
     mocker, capfd, mocked_android_modules, call_there_group, test_py_script
 ):
     pin_shortcut = mocker.patch("android_here.pin_shortcut")
-    call_there_group(["pin", test_py_script, "--label", "Test label"], "")
+    await call_there_group(["pin", test_py_script, "--label", "Test label"], "")
     captured = capfd.readouterr()
     assert not captured.out and not captured.err
 
@@ -66,7 +66,7 @@ async def test_pin_command_default_label(
     mocker, capfd, mocked_android_modules, call_there_group, test_py_script
 ):
     pin_shortcut = mocker.patch("android_here.pin_shortcut")
-    call_there_group(["pin", test_py_script], "")
+    await call_there_group(["pin", test_py_script], "")
     captured = capfd.readouterr()
     assert not captured.out and not captured.err
 

tests/test_server_here.py

@@ -60,7 +60,7 @@ async def test_run_ssh_server_clears_config_ready_after_start_error(mocker):
     start_server.assert_called_once()
     config = start_server.call_args.args[0]
     assert config.host == ""
-    assert config.chroot == app.upload_dir
+    assert config.sftp_root == app.upload_dir
     assert config.key_path == Path("./key.rsa").resolve()
     assert not app.ssh_server_config_ready.is_set()
     show_exception_popup.assert_called_once_with(start_error)