leaf-framework 0.10.25__tar.gz → 0.11.1__tar.gz

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: leaf-framework
-Version: 0.10.25
+Version: 0.11.1
 Summary: Lightweight Adapter Framework (LEAF)
 License: Apache-2.0
 License-File: LICENSE
@@ -12,16 +12,14 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Dist: aioredis (>=2.0.1,<2.1.0)
 Requires-Dist: cairosvg (>=2.9.1,<3.0.0)
 Requires-Dist: dateparser (>=1.4.3,<1.5.0)
 Requires-Dist: httpx (>=0.28.1,<0.29.0)
-Requires-Dist: influxobject (>=0.0.13)
+Requires-Dist: leafobject (>=0.0.14,<0.0.15)
 Requires-Dist: nicegui (>=3.18.0,<3.19.0)
 Requires-Dist: paho-mqtt (>=2.1.0,<2.2.0)
 Requires-Dist: pillow (>=13.0.0,<14.0.0)
 Requires-Dist: pyyaml (>=6.0.3,<6.1.0)
-Requires-Dist: redis (>=8.1.0,<8.2.0)
 Requires-Dist: requests (>=2.34.2,<2.35.0)
 Requires-Dist: watchdog (>=7.0.0,<7.1.0)
 Project-URL: Documentation, https://leaf-framework.org
@@ -54,7 +52,7 @@ LEAF checks PyPI for a newer release one hour after it starts, and weekly from t
 
 To check without waiting for the schedule, **click the version number** in the header. The result appears as a banner: green when this install is current, amber when a newer release exists, red when PyPI could not be reached.
 
-Set `LEAF_DISABLE_UPDATE_CHECK=1` to switch the check off entirely. Installs running from a source checkout are told about the new version but never overwritten -- update those with `git pull`. To update by hand:
+Set `LEAF_DISABLE_UPDATE_CHECK=1` to switch the check off entirely. Set `LEAF_DISABLE_ADAPTER_INSTALL=1` to stop the web interface from installing or uninstalling adapters, e.g. on a shared deployment whose adapters come from its image. Installs running from a source checkout are told about the new version but never overwritten -- update those with `git pull`. To update by hand:
 
 ```bash
 pip install --upgrade leaf-framework

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/README.md

@@ -24,7 +24,7 @@ LEAF checks PyPI for a newer release one hour after it starts, and weekly from t
 
 To check without waiting for the schedule, **click the version number** in the header. The result appears as a banner: green when this install is current, amber when a newer release exists, red when PyPI could not be reached.
 
-Set `LEAF_DISABLE_UPDATE_CHECK=1` to switch the check off entirely. Installs running from a source checkout are told about the new version but never overwritten -- update those with `git pull`. To update by hand:
+Set `LEAF_DISABLE_UPDATE_CHECK=1` to switch the check off entirely. Set `LEAF_DISABLE_ADAPTER_INSTALL=1` to stop the web interface from installing or uninstalling adapters, e.g. on a shared deployment whose adapters come from its image. Installs running from a source checkout are told about the new version but never overwritten -- update those with `git pull`. To update by hand:
 
 ```bash
 pip install --upgrade leaf-framework

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/adapters/control_spec.py

@@ -10,6 +10,7 @@ import os
 from typing import cast
 
 import yaml
+from leafobject import LeafPoint  # pyright: ignore[reportMissingTypeStubs]
 
 Control = dict[str, object]
 
@@ -122,3 +123,60 @@ def check_control(controls: list[Control], data: str) -> None:
             raise ValueError(f"{metric} cannot be set to {value!r}")
     elif not isinstance(value, str) or not value:
         raise ValueError(f"{metric} needs a text value")
+
+
+def _part(point: dict[str, object], key: str) -> dict[str, object]:
+    """A copy of point[key] when it is a dict, else an empty dict."""
+    part = point.get(key)
+    if isinstance(part, dict):
+        return dict(cast(dict[str, object], part))
+    return {}
+
+
+def _field_value(value: object) -> int | float | str:
+    """value as a LeafPoint field allows it: a number or text, anything else as its JSON."""
+    if isinstance(value, (int, float, str)):
+        return value
+    return json.dumps(value)
+
+
+def result_record(
+    data: str, source: str, error: Exception | None = None, instance_tags: dict[str, str] | None = None
+) -> dict[str, object]:
+    """
+    A control message as the LeafPoint LEAF publishes on <control topic>/result, so that what was
+    sent to the equipment is stored with the measurements.
+
+    source ("ui" or "mqtt"), status ("applied" or "rejected") and a rejection's "error" are tags,
+    for consumers to filter on. Built as a leafobject LeafPoint, so tags are text and there is
+    always a field: a message without fields keeps its raw text in "message".
+    """
+    point: dict[str, object] = {}
+    try:
+        parsed = cast(object, json.loads(data))
+        if isinstance(parsed, dict):
+            point = cast(dict[str, object], parsed)
+    except ValueError:
+        pass
+    tags: dict[str, str] = {}
+    for key, value in _part(point, "tags").items():
+        tags[key] = str(value)
+    # The instance's organisation and department, where the message didn't set them
+    if instance_tags is not None:
+        for key, value in instance_tags.items():
+            _ = tags.setdefault(key, value)
+    fields: dict[str, int | float | str] = {}
+    for key, value in _part(point, "fields").items():
+        fields[key] = _field_value(value)
+    tags["source"] = source
+    tags["status"] = "applied"
+    if error is not None:
+        tags["status"] = "rejected"
+        tags["error"] = str(error)
+    if not fields:
+        fields["message"] = data
+    record = LeafPoint()
+    record.set_measurement(str(point.get("measurement", "control")))
+    record.set_tags(tags)
+    record.set_fields(fields)
+    return {**record.to_json()}

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/adapters/equipment_adapter.py

@@ -4,7 +4,7 @@ from abc import ABC, abstractmethod
 from threading import Event
 from typing import Any
 
-from leaf.adapters.control_spec import Control, check_control
+from leaf.adapters.control_spec import Control, check_control, result_record
 from leaf.error_handler import exceptions
 from leaf.error_handler.error_holder import ErrorHolder
 from leaf.error_handler.exceptions import LEAFError
@@ -254,7 +254,10 @@ class EquipmentAdapter(ABC):
         except Exception as e:
             # The error holder reports it later; log it now so the sender can see why nothing happened
             self._logger.warning(f"Control message on {topic} rejected: {e}")
+            self._report_control(topic, data, "mqtt", e)
             self._handle_exception(exceptions.AdapterLogicError(f"Controller failed: {e}"))
+            return
+        self._report_control(topic, data, "mqtt")
 
     def has_controller(self) -> bool:
         """True when the instance runs with control: true and a controller is attached."""
@@ -281,8 +284,19 @@ class EquipmentAdapter(ABC):
             self._controller.control(topic, data)
         except Exception as e:
             # Reported like a control message from MQTT, so it also reaches the error topic
+            self._report_control(topic, data, "ui", e)
             self._handle_exception(exceptions.AdapterLogicError(f"Controller failed: {e}"))
             raise
+        self._report_control(topic, data, "ui")
+
+    def _report_control(self, topic: str, data: str, source: str, error: Exception | None = None) -> None:
+        """Publish what happened to a control message on <control topic>/result, so it is stored with the data."""
+        # Never let the record break the command it describes
+        try:
+            record = result_record(data, source, error, self._metadata_manager.instance_tags())
+            _ = self._output.transmit(f"{topic}/result", record)
+        except Exception as e:
+            self._logger.warning(f"Could not publish the control record for {topic}: {e}")
 
     def _subscribe_control(self) -> None:
         if self._controller is not None:

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/config/configuration.yaml

@@ -26,24 +26,16 @@ OUTPUTS:
 #   protocol: v3   #OPTIONAL expects "v3" "v5"
 #   transport: tcp #OPTIONAL expects "tcp", "websockets", "unix"
 #   tls: False     #OPTIONAL expects True, False
-#   fallback: SQL  #OPTIONAL expects "SQL", "KEYDB", "FILE"
+#   fallback: FILE #OPTIONAL expects "SQL", "FILE"
 
 # SQL output requires 'filename' of database 
 # and optionally an alternative 'fallback' output
 #  - plugin: SQL
 #    filename: messages.db
-#    fallback: KEYDB #OPTIONAL expects "MQTT", "KEYDB", "FILE"
-
-# KEYDB output requires 'host', 'port', 'db'
-# and optionally an alternative 'fallback' output
-#  - plugin: KEYDB
-#    host: localhost
-#    port: 6379
-#    db: 0
-#    fallback: FILE #OPTIONAL expects "MQTT", "SQL", "FILE"
+#    fallback: FILE #OPTIONAL expects "MQTT", "FILE"
 
 # FILE output requires 'filename'
 # and optionally an alternative 'fallback' output
 #  - plugin: FILE
 #    filename: local.json
-#    fallback: FILE #OPTIONAL expects "MQTT", "SQL", "KEYDB"
+#    fallback: SQL #OPTIONAL expects "MQTT", "SQL"

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/data/marketplace.yaml

@@ -3,7 +3,7 @@
 
 - adapter_id: Table
   image: "./images/table.png"
-  description: "File conversion module to parse tabular data from various file formats into InfluxObject messages."
+  description: "File conversion module to parse tabular data from various file formats into LeafPoint messages."
   equipment_data:
     version: "1.0"
     manufacturer: LEAF
@@ -233,6 +233,10 @@
     application: Monitoring
   # requirements:
   repo_url: https://git.wur.nl/leaf/adapters/leaf-ramsmart.git
+  # Private repository: installed with a username and token handed out per user. One deploy
+  # token (read_repository, with an expiry) per person, named after them; lost → revoke and reissue.
+  access: restricted
+  request_access: mailto:access@leaf-framework.org?subject=Access%20to%20LEAF-RAMSMART
   name: LEAF-RAMSMART
 - adapter_id: BluetoothScanner
   image: icon:bi-bluetooth

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/modules/input_modules/ble_watcher.py

@@ -21,7 +21,6 @@ logger = get_logger(__name__, log_file="input_module.log")
 FIRST_RECONNECT_DELAY = 1
 RECONNECT_RATE = 2
 MAX_RECONNECT_DELAY = 60
-MAX_RECONNECT_COUNT = 12
 
 
 class BLEEventWatcher(EventWatcher):

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/modules/input_modules/mqtt_external_event_watcher.py

@@ -241,22 +241,3 @@ class MQTTExternalEventWatcher(ExternalEventWatcher):
             bool: True if the client is connected, False otherwise.
         """
         return self.client.is_connected()
-
-    def _handle_return_code(self, return_code: int) -> ClientUnreachableError | None:
-        """
-        Handle MQTT return codes.
-
-        Args:
-            return_code (int): The return code to handle.
-
-        Returns:
-            Optional[ClientUnreachableError]: An error if one occurred, None otherwise.
-        """
-        if return_code == mqtt.MQTT_ERR_SUCCESS:
-            return None
-        message = {
-            mqtt.MQTT_ERR_NO_CONN: "Can't connect to broker",
-            mqtt.MQTT_ERR_QUEUE_SIZE: "Message queue size limit reached",
-        }.get(return_code, f"Unknown error with return code {return_code}")
-
-        return ClientUnreachableError(message, output_module=self, severity=SeverityLevel.INFO)

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/modules/output_modules/mqtt.py

@@ -527,7 +527,7 @@ class MQTT(OutputModule):
         Retrieve and remove a stored message from the fallback.
 
         MQTT does not buffer messages locally, so this delegates to the fallback
-        module (e.g., KeyDB or FILE) to retrieve buffered messages.
+        module (e.g., SQL or FILE) to retrieve buffered messages.
 
         Args:
             key (Optional[str]): A key for which to pop data. Defaults to None.

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/modules/output_modules/topic_store.py

@@ -98,7 +98,7 @@ def history_key(topic: str, point: object) -> str:
 
 
 def _point_sample(point: object) -> tuple[float, float] | None:
-    """(timestamp, value) of a LeafPoint/InfluxPoint JSON dict with a numeric fields.value, or None."""
+    """(timestamp, value) of a LeafPoint JSON dict with a numeric fields.value, or None."""
     if not isinstance(point, dict):
         return None
     point_dict = cast(dict[str, object], point)

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/modules/phase_modules/measure.py

@@ -43,6 +43,7 @@ class MeasurePhase(PhaseModule):
 
         super().__init__(term_builder, metadata_manager=metadata_manager, error_holder=error_holder)
         self._maximum_message_size: int = maximum_message_size
+        self._tag_mismatches: set[tuple[str, str]] = set()
         # Guards against a second measurement running concurrently with one still
         # draining (e.g. a generator-based interpreter that streams for a long time,
         # or forever). Without this, an overlapping event (e.g. FileWatcher's
@@ -231,6 +232,7 @@ class MeasurePhase(PhaseModule):
             list[tuple]: A list of (action, result) tuples.
         """
         if isinstance(result, dict):
+            self._add_instance_tags(cast(object, result))
             measurement = self._resolve_measurement(result)
             action = self._term_builder(experiment_id=experiment_id, measurement=measurement)
             return [(action, result)]
@@ -239,6 +241,7 @@ class MeasurePhase(PhaseModule):
         point_json = point_json_of(payload)
         if point_json is not None:
             result = point_json
+            self._add_instance_tags(cast(object, result))
             measurement = self._resolve_measurement(result)
             action = self._term_builder(experiment_id=experiment_id, measurement=measurement)
             return [(action, result)]
@@ -254,6 +257,7 @@ class MeasurePhase(PhaseModule):
 
             groups: dict[str, list] = {}
             for item in converted:
+                self._add_instance_tags(cast(object, item))
                 if isinstance(item, dict):
                     key = self._resolve_measurement(item)
                 else:
@@ -270,6 +274,24 @@ class MeasurePhase(PhaseModule):
         self._handle_exception(excp)
         return []
 
+    def _add_instance_tags(self, item: object) -> None:
+        """Tag a point with its instance's organisation and department, unless the adapter already did."""
+        if self._metadata_manager is None or not isinstance(item, dict) or "fields" not in item:
+            return
+        tags = cast(dict[str, object], item).setdefault("tags", {})
+        if not isinstance(tags, dict):
+            return
+        for key, value in self._metadata_manager.instance_tags().items():
+            current = cast(dict[str, object], tags).get(key)
+            if current is None:
+                tags[key] = value
+            elif str(current) != value and (key, str(current)) not in self._tag_mismatches:
+                # Kept as the adapter set it; warned once so every measurement doesn't repeat it
+                self._tag_mismatches.add((key, str(current)))
+                logger.warning(
+                    f"Tag {key}={current!r} differs from the configured {key} {value!r}; keeping {current!r}"
+                )
+
     def _resolve_measurement(self, item: dict) -> str:
         """
         Resolve the measurement label used for the topic's last segment.
@@ -291,7 +313,7 @@ class MeasurePhase(PhaseModule):
 
 
 def point_json_of(item: object) -> dict[str, object] | None:
-    """JSON of an InfluxPoint or leafobject LeafPoint, recognised by to_json() so LEAF need not depend on leafobject."""
+    """JSON of a leafobject LeafPoint (or anything else with to_json()), else None."""
     if isinstance(item, dict):
         return None
     to_json: object = getattr(item, "to_json", None)

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/register/equipment_actions.yaml

@@ -3,6 +3,7 @@ running: <root>/<organisation>/<department>/<adapter_id>/<instance_id>/running
 heartbeat: <root>/<organisation>/<department>/<adapter_id>/<instance_id>/heartbeat
 error: <root>/<organisation>/<department>/<adapter_id>/<instance_id>/error
 control: <root>/<organisation>/<department>/<adapter_id>/<instance_id>/control
+control_result: <root>/<organisation>/<department>/<adapter_id>/<instance_id>/control/result
 experiment:
   start: <root>/<organisation>/<department>/<adapter_id>/<instance_id>/experiment/start
   stop: <root>/<organisation>/<department>/<adapter_id>/<instance_id>/experiment/stop

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/register/metadata.py

@@ -1,6 +1,6 @@
 import json
 import os
-from typing import Any
+from typing import Any, cast
 
 import yaml  # type: ignore
 
@@ -60,6 +60,15 @@ class MetadataManager:
             return self._instance_data
         return self._instance_data.get(key)
 
+    def instance_tags(self) -> dict[str, str]:
+        """The organisation and department tags every point of this instance carries."""
+        tags: dict[str, str] = {}
+        for key in ("organisation", "department"):
+            value = cast(object, self._instance_data.get(key))  # pyright: ignore[reportUnknownMemberType]
+            if value:
+                tags[key] = str(value)
+        return tags
+
     def get_instance_id(self) -> str:
         """Convenience accessor for 'instance_id' in equipment."""
         return self._instance_data.get("instance_id", "")

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/registry/discovery.py

@@ -16,8 +16,7 @@ from leaf.utility.logger.logger_utils import get_logger
 root_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..")
 adapter_dir = os.path.join(root_dir, "adapters")
 core_adapter_dir = os.path.join(adapter_dir, "core_adapters")
-functional_adapter_dir = os.path.join(adapter_dir, "functional_adapters")
-default_equipment_locations = [core_adapter_dir, functional_adapter_dir]
+default_equipment_locations = [core_adapter_dir]
 
 output_module_dir = os.path.join(root_dir, "modules", "output_modules")
 input_module_dir = os.path.join(root_dir, "modules", "input_modules")

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/registry/registry.py

@@ -56,13 +56,6 @@ def get_external_input(code: str) -> type[ExternalEventWatcher]:
     return cls
 
 
-def all_registered(plugin_type: PluginType) -> dict[str, type[Any]]:
-    """
-    Return all registered classes of a given plugin type.
-    """
-    return dict(_registry[plugin_type])
-
-
 def discover_from_config(config: dict[str, Any], external_path: str = None) -> None:
     """
     Discover and register only the plugins referenced in the given configuration.

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/start.py

@@ -111,7 +111,7 @@ def parse_args(args: list[str] | None = None) -> argparse.Namespace:
         "--port",
         type=int,
         default=4242,
-        help="Port to run the NiceGUI interface on. Default is 8080.",
+        help="Port to run the NiceGUI interface on. Default is 4242.",
     )
 
     parser.add_argument(

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/ui/constants.py

@@ -1,16 +1,11 @@
 """Constants for LEAF UI."""
 
 # Server constants
-DEFAULT_PORT = 8080
+DEFAULT_PORT = 4242
 MARKETPLACE_URL = "https://gitlab.com/leaf-framework/leaf-marketplace/-/raw/main/public/adapter.yaml"
 MAX_LOG_LINES = 1000
-CONFIGURATION_FILENAME = "configuration.yaml"
 
 # UI Constants
 CARD_WIDTH_CLASS = "w-64"
-HEADER_CLASSES = "leaf-header"
 CARD_CLASSES = "leaf-card"
 TAB_CLASSES = "leaf-tab"
-
-# Color constants
-STATUS_COLORS = {"online": "status-online", "offline": "status-offline", "warning": "status-warning"}

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/ui/interface.py

@@ -38,12 +38,6 @@ def get_startup_error() -> str | None:
     return _startup_error
 
 
-def clear_startup_error() -> None:
-    """Clear the startup error."""
-    global _startup_error
-    _startup_error = None
-
-
 def start_nicegui(port: int = DEFAULT_PORT, config_path: Path | None = None, auto_open_browser: bool = True) -> None:
     """
     Start the LEAF NiceGUI web interface.

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/ui/markdown/configuration_help.md

@@ -15,10 +15,12 @@ EQUIPMENT_INSTANCES:
 Configure data destinations:
 ```yaml
 OUTPUTS:
-  - plugin: KEYDB
-    host: localhost
-    port: 6379
+  - plugin: MQTT
+    broker: localhost
+    port: 1883
     fallback: FILE
+  - plugin: FILE
+    filename: fallback.json
 ```
 
 #### Available Adapters

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/ui/markdown/documentation_main.md

@@ -41,13 +41,10 @@ OUTPUTS:
   - plugin: MQTT
     broker: localhost
     port: 1883
-    fallback: KEYDB
-
-  - plugin: KEYDB
-    host: localhost
-    port: 6379
-    db: 0
     fallback: FILE
+
+  - plugin: FILE
+    filename: fallback.json
 ```
 
 ###### Available Adapters

{leaf_framework-0.10.25 → leaf_framework-0.11.1}/leaf/ui/tabs/adapters.py

@@ -1,5 +1,6 @@
 """LEAF Adapters tab."""
 
+from collections.abc import Mapping
 from pathlib import Path
 
 import httpx
@@ -8,7 +9,7 @@ from nicegui import ui
 
 from leaf.registry.discovery import get_all_adapter_codes
 from leaf.ui.constants import CARD_CLASSES, CARD_WIDTH_CLASS, MARKETPLACE_URL
-from leaf.ui.utils import install_adapter, uninstall_adapter
+from leaf.ui.utils import adapter_install_disabled, check_repository_url, install_adapter, uninstall_adapter
 from leaf.utility.logger.logger_utils import get_logger
 
 logger = get_logger(__name__, log_file="input_module.log")
@@ -160,6 +161,96 @@ def load_bundled_marketplace() -> list | None:
     return None
 
 
+# install_adapter/uninstall_adapter refuse too; these only leave out buttons that would not work
+def _install_button(adapter: Mapping[str, object]) -> None:
+    """The marketplace card's Install button, unless adapter installs are disabled."""
+    if adapter_install_disabled():
+        return
+    if adapter.get("access") == "restricted":
+        _ = ui.button("Install with token", icon="lock", on_click=lambda: _token_dialog(adapter)).classes(
+            "btn-secondary w-full rounded-lg transition-colors"
+        )
+        return
+    _ = ui.button("Install", icon="download", on_click=lambda: install_adapter(dict(adapter))).classes(
+        "btn-secondary w-full rounded-lg transition-colors"
+    )
+
+
+def _token_dialog(adapter: Mapping[str, object]) -> None:
+    """Asks for the access token of a restricted adapter, which is only installable with one."""
+    name = str(adapter.get("name") or adapter.get("adapter_id"))
+    with ui.dialog() as dialog, ui.card().classes("w-96"):
+        _ = ui.label(f"{name} is available on request").classes("text-h6")
+        _ = ui.label("Enter the username and token you received, e.g. a GitLab deploy token.").classes("text-body")
+        username = ui.input("Username").classes("w-full")
+        token = ui.input("Token", password=True, password_toggle_button=True).classes("w-full")
+        request = adapter.get("request_access")
+        if request:
+            _ = ui.link("Request access", str(request), new_tab=True)
+
+        async def install() -> None:
+            _ = dialog.close()
+            await install_adapter(dict(adapter), (str(username.value), str(token.value)))
+
+        with ui.row().classes("w-full justify-end"):
+            _ = ui.button("Cancel", on_click=dialog.close).classes("btn-tertiary")
+            _ = ui.button("Install", icon="download", on_click=install).classes("btn-secondary")
+    _ = dialog.open()
+
+
+def _install_from_url_button() -> None:
+    """Installs an adapter that is not in the marketplace, unless adapter installs are disabled."""
+    if adapter_install_disabled():
+        return
+    _ = ui.button("Install from git URL", icon="link", on_click=_url_dialog).classes("btn-secondary mb-4")
+
+
+def _url_dialog() -> None:
+    """Asks for the git URL of an adapter, plus a username and token if its repository is private."""
+    with ui.dialog() as dialog, ui.card().classes("w-96"):
+        _ = ui.label("Install from a git URL").classes("text-h6")
+        _ = ui.label("Only install adapters from sources you trust: they run on this machine.").classes("text-body")
+        url = ui.input("Git URL", placeholder="https://gitlab.com/group/leaf-adapter.git").classes("w-full")
+        username = ui.input("Username (private repositories only)").classes("w-full")
+        token = ui.input("Token (private repositories only)", password=True, password_toggle_button=True).classes(
+            "w-full"
+        )
+
+        async def install() -> None:
+            repository = str(url.value).strip()
+            credentials = None
+            if username.value or token.value:
+                credentials = (str(username.value), str(token.value))
+            problem = check_repository_url(repository, credentials is not None)
+            if problem:
+                ui.notify(problem, type="negative", position="top")
+                return
+            _ = dialog.close()
+            name = repository.rstrip("/").rsplit("/", 1)[-1].removesuffix(".git")
+            await install_adapter({"name": name, "repo_url": repository}, credentials)
+
+        with ui.row().classes("w-full justify-end"):
+            _ = ui.button("Cancel", on_click=dialog.close).classes("btn-tertiary")
+            _ = ui.button("Install", icon="download", on_click=install).classes("btn-secondary")
+    _ = dialog.open()
+
+
+def _uninstall_button(adapter: Mapping[str, object]) -> None:
+    """The installed adapter card's Uninstall button, unless adapter installs are disabled."""
+    if adapter_install_disabled():
+        return
+    _ = ui.button("Uninstall", icon="delete", on_click=lambda: uninstall_adapter(dict(adapter))).classes(
+        "btn-tertiary w-full rounded-lg transition-colors"
+    )
+
+
+def _install_disabled_note() -> None:
+    """Says why the marketplace has no Install buttons."""
+    if not adapter_install_disabled():
+        return
+    _ = ui.label("Installing and uninstalling adapters is disabled on this LEAF.").classes("text-body mb-4")
+
+
 def build_adapters_content(container: ui.column) -> None:
     """
     Build the adapters content (installed and marketplace).
@@ -228,12 +319,7 @@ def build_adapters_content(container: ui.column) -> None:
                         ui.label(installed_adapter["code"]).classes("text-lg font-bold text-heading mb-1")
                         ui.label(installed_adapter["name"]).classes("text-sm text-body mb-3")
 
-                        def make_uninstall_handler(adapter):
-                            return lambda: uninstall_adapter(adapter)
-
-                        ui.button(
-                            "Uninstall", icon="delete", on_click=make_uninstall_handler(installed_adapter)
-                        ).classes("btn-tertiary w-full rounded-lg transition-colors")
+                        _uninstall_button(installed_adapter)
         else:
             with ui.card().classes("bg-info-card border border-default p-4 mb-8"):
                 with ui.row().classes("items-center"):
@@ -246,6 +332,8 @@ def build_adapters_content(container: ui.column) -> None:
         with ui.row().classes("items-center mb-4"):
             ui.icon("store", size="1.5rem").classes("text-icon")
             ui.label("Adapter Marketplace").classes("text-xl font-semibold text-subheading ml-2")
+        _install_disabled_note()
+        _install_from_url_button()
 
         # Container for marketplace adapters
         marketplace_container = ui.column().classes("w-full")
@@ -350,12 +438,7 @@ def build_adapters_content(container: ui.column) -> None:
                                     ui.label(adapter["adapter_id"]).classes("text-lg font-bold text-heading mb-1")
                                     ui.label(adapter.get("name", "No description")).classes("text-sm text-body mb-3")
 
-                                    def make_install_handler(adptr):
-                                        return lambda: install_adapter(adptr)
-
-                                    ui.button(
-                                        "Install", icon="download", on_click=make_install_handler(adapter)
-                                    ).classes("btn-secondary w-full rounded-lg transition-colors")
+                                    _install_button(adapter)
             except Exception as e:
                 logger.error(f"Failed to load marketplace: {e}", exc_info=True)
                 # Remove loading indicator