Merge pull request #9 from salmon-21/fix-remote-ankiconnect-url

fix: wire up ankiconnect_url and allow_non_localhost from config

Author: ubermenchh

anki_cli/backends/ankiconnect.py

@@ -92,7 +92,11 @@ def _invoke(self, action: str, **params: JSONValue) -> JSONValue:
         }
 
         try:
-            response = self._client.post(self._url, json=payload)
+            response = self._client.post(
+                self._url,
+                json=payload,
+                headers={"Connection": "close"},
+            )
             response.raise_for_status()
         except httpx.TimeoutException as exc:
             raise AnkiConnectUnavailableError(
@@ -102,6 +106,10 @@ def _invoke(self, action: str, **params: JSONValue) -> JSONValue:
             raise AnkiConnectUnavailableError(
                 f"Cannot connect to AnkiConnect at {self._url}. Is Anki running with the add-on?"
             ) from exc
+        except httpx.RemoteProtocolError as exc:
+            raise AnkiConnectUnavailableError(
+                f"AnkiConnect at {self._url} disconnected unexpectedly: {exc}"
+            ) from exc
         except httpx.HTTPError as exc:
             raise AnkiConnectUnavailableError(
                 f"HTTP error contacting AnkiConnect at {self._url}: {exc}"

anki_cli/backends/detect.py

@@ -40,7 +40,7 @@ def detect_backend(
     if forced == "ankiconnect":
         if not _ankiconnect_reachable(ankiconnect_url):
             raise DetectionError(
-                "AnkiConnect backend forced, but it is not reachable at localhost:8765.",
+                f"AnkiConnect backend forced, but it is not reachable at {ankiconnect_url}.",
                 exit_code=7
             )
         return DetectionResult(

anki_cli/backends/factory.py

@@ -25,15 +25,18 @@ def create_backend_from_context(obj: dict[str, Any]) -> AnkiBackend:
     app_config = obj.get("app_config")
 
     ankiconnect_url = "http://localhost:8765"
+    allow_non_localhost = False
     if isinstance(app_config, AppConfig):
         ankiconnect_url = app_config.backend.ankiconnect_url
+        allow_non_localhost = app_config.backend.allow_non_localhost
 
     if backend_name == "ankiconnect":
         try:
             return AnkiConnectBackend(
                 url=ankiconnect_url,
                 collection_path=collection_path,
                 verify_version=True,
+                allow_non_localhost=allow_non_localhost,
             )
         except AnkiConnectError as exc:
             raise BackendFactoryError(str(exc)) from exc

anki_cli/cli/app.py

@@ -133,6 +133,7 @@ def main(
         detection = detect_backend(
             forced_backend=runtime.backend,
             col_override=runtime.collection_override,
+            ankiconnect_url=runtime.app.backend.ankiconnect_url,
         )
     except DetectionError as exc:
         formatter = formatter_from_ctx(ctx)

anki_cli/models/config.py

@@ -11,6 +11,7 @@ class CollectionConfig(BaseModel):
 class BackendConfig(BaseModel):
     prefer: str = Field(default="auto")
     ankiconnect_url: str = "http://localhost:8765"
+    allow_non_localhost: bool = False
 
 
 class DisplayConfig(BaseModel):