citrascope 0.3.0__tar.gz → 0.4.0__tar.gz

{citrascope-0.3.0 → citrascope-0.4.0}/.github/copilot-instructions.md

@@ -25,7 +25,6 @@ This project is a Python package for interacting with astronomical data and serv
   - `citrascope/web/templates/`: HTML templates
   - `citrascope/web/static/`: CSS and JavaScript files
 - `tests/`: Unit and integration tests
-- `docs/`: Project documentation
 
 ## Testing
 - All new features and bug fixes should include corresponding tests in `tests/`.
@@ -77,7 +76,7 @@ The web interface provides real-time monitoring and configuration for telescope
 
 This project relies on several key Python packages. Below are some of the most important ones and their roles:
 
-- **Click**: Used for building the command-line interface (CLI). The main entry point for the application (`python -m citrascope start`) is implemented using Click.
+- **Click**: Used for building the command-line interface (CLI). The main entry point for the application (`python -m citrascope`) is implemented using Click.
 - **Pydantic-Settings**: Manages configuration and settings, ensuring type safety and validation for environment variables.
 - **Requests** and **HTTPX**: Handle HTTP requests for interacting with the Citra.space API.
 - **Python-Dateutil**: Provides robust date and time parsing utilities.
@@ -102,5 +101,5 @@ For a complete list of dependencies, refer to the `pyproject.toml` file.
 
 ## Additional Notes
 - Keep dependencies minimal and update `pyproject.toml` as needed.
-- Document any major changes in `docs/index.md`.
+- Documentation is maintained in the [citra-space/docs](https://github.com/citra-space/docs) repository under `docs/citrascope/`.
 - Use pre-commit hooks for code quality.

{citrascope-0.3.0 → citrascope-0.4.0}/.gitignore

@@ -68,9 +68,6 @@ instance/
 # Scrapy stuff:
 .scrapy
 
-# Sphinx documentation
-docs/build/
-
 # PyBuilder
 target/
 

{citrascope-0.3.0 → citrascope-0.4.0}/.vscode/launch.json

@@ -4,29 +4,20 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Python: citrascope dev start",
+            "name": "Python: citrascope",
             "type": "debugpy",
             "request": "launch",
             "module": "citrascope",
-            "args": ["--dev", "start"],
+            "args": [],
             "console": "integratedTerminal",
             "justMyCode": false
         },
         {
-            "name": "Python: citrascope dev start, keep images",
+            "name": "Python: citrascope (custom port)",
             "type": "debugpy",
             "request": "launch",
             "module": "citrascope",
-            "args": ["--dev", "--keep-images", "start"],
-            "console": "integratedTerminal",
-            "justMyCode": false
-        },
-        {
-            "name": "Python: citrascope dev start DEBUG logging",
-            "type": "debugpy",
-            "request": "launch",
-            "module": "citrascope",
-            "args": ["--dev", "--log-level", "DEBUG", "start"],
+            "args": ["--web-port", "8080"],
             "console": "integratedTerminal",
             "justMyCode": false
         }

{citrascope-0.3.0 → citrascope-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: citrascope
-Version: 0.3.0
+Version: 0.4.0
 Summary: Remotely control a telescope while it polls for tasks, collects and edge processes data, and delivers results and data for further processing.
 Author-email: Patrick McDavid <patrick@citra.space>
 License-Expression: MIT
@@ -9,13 +9,9 @@ Requires-Dist: click
 Requires-Dist: fastapi>=0.104.0
 Requires-Dist: httpx
 Requires-Dist: platformdirs>=4.0.0
-Requires-Dist: pydantic-settings
-Requires-Dist: pytest-cov
 Requires-Dist: python-dateutil
-Requires-Dist: python-json-logger
 Requires-Dist: requests
 Requires-Dist: skyfield
-Requires-Dist: types-python-dateutil
 Requires-Dist: uvicorn[standard]>=0.24.0
 Requires-Dist: websockets>=12.0
 Provides-Extra: all
@@ -38,10 +34,7 @@ Requires-Dist: mypy; extra == 'dev'
 Requires-Dist: pre-commit; extra == 'dev'
 Requires-Dist: pytest; extra == 'dev'
 Requires-Dist: pytest-cov; extra == 'dev'
-Provides-Extra: docs
-Requires-Dist: sphinx; extra == 'docs'
-Requires-Dist: sphinx-autodoc-typehints; extra == 'docs'
-Requires-Dist: sphinx-markdown-builder; extra == 'docs'
+Requires-Dist: types-python-dateutil; extra == 'dev'
 Provides-Extra: indi
 Requires-Dist: pixelemon; extra == 'indi'
 Requires-Dist: plotly; extra == 'indi'
@@ -65,33 +58,46 @@ Remotely control a telescope while it polls for tasks, collects observations, an
 - Connects to configured telescope and camera hardware
 - Acts as a task daemon carrying out and remitting photography tasks
 
+## Documentation
+
+Full documentation is available at [docs.citra.space](https://docs.citra.space/citrascope/).
+
+Documentation source is maintained in the [citra-space/docs](https://github.com/citra-space/docs) repository.
+
 ## Installation
 
-### Install with pipx
+**Important:** CitraScope requires Python 3.10, 3.11, or 3.12.
 
-[pipx](https://pipx.pypa.io/) installs the CLI tool in an isolated environment while making it globally available:
+### Check Your Python Version
 
 ```sh
-pipx install citrascope
+python3 --version
 ```
 
-### Optional Dependencies
+If you don't have a compatible version, install one with [pyenv](https://github.com/pyenv/pyenv):
 
-CitraScope supports different hardware adapters through optional dependency groups:
+```sh
+pyenv install 3.12.0
+pyenv local 3.12.0  # Sets Python 3.12.0 for the current directory
+```
 
-- **INDI adapter** (for Linux-based telescope control):
-  ```sh
-  pipx install citrascope[indi]
-  # or with pip: pip install citrascope[indi]
-  ```
+### Install CitraScope
 
-- **All optional dependencies**:
-  ```sh
-  pipx install citrascope[all]
-  # or with pip: pip install citrascope[all]
-  ```
+**Recommended: Using pip in a virtual environment**
 
-The base installation without optional dependencies supports the NINA adapter, which works via HTTP API calls and does not require additional Python packages.
+```sh
+python3 -m venv citrascope-env
+source citrascope-env/bin/activate  # On Windows: citrascope-env\Scripts\activate
+pip install citrascope
+```
+
+### Optional Dependencies
+
+For Linux-based telescope control (INDI):
+
+```sh
+pip install citrascope[indi]
+```
 
 This provides the `citrascope` command-line tool. To see available commands:
 
@@ -101,16 +107,18 @@ citrascope --help
 
 ## Usage
 
-Run the CLI tool:
+### Starting the Daemon
+
+Run the daemon with:
 
 ```sh
-citrascope start
+citrascope
 ```
 
-To connect to the Citra Dev server:
+By default, this starts the web interface on `http://localhost:24872`. You can customize the port:
 
 ```sh
-citrascope start --dev
+citrascope --web-port 8080
 ```
 
 ## Developer Setup
@@ -174,10 +182,10 @@ Then create a release in the GitHub UI from the new tag. This triggers automatic
 
 If you are using Visual Studio Code, you can run or debug the project directly using the pre-configured launch options in `.vscode/launch.json`:
 
-- **Python: citrascope dev start** — Runs the main entry point with development options.
-- **Python: citrascope dev start DEBUG logging** — Runs with development options and sets log level to DEBUG for more detailed output.
+- **Python: citrascope** — Runs the daemon with default settings
+- **Python: citrascope (custom port)** — Runs with web interface on port 8080
 
-To use these, open the Run and Debug panel in VS Code, select the desired configuration, and click the Run or Debug button. This is a convenient way to start or debug the app without manually entering commands.
+To use these, open the Run and Debug panel in VS Code, select the desired configuration, and click the Run or Debug button.
 
 ## Running Tests
 

{citrascope-0.3.0 → citrascope-0.4.0}/README.md

@@ -9,33 +9,46 @@ Remotely control a telescope while it polls for tasks, collects observations, an
 - Connects to configured telescope and camera hardware
 - Acts as a task daemon carrying out and remitting photography tasks
 
+## Documentation
+
+Full documentation is available at [docs.citra.space](https://docs.citra.space/citrascope/).
+
+Documentation source is maintained in the [citra-space/docs](https://github.com/citra-space/docs) repository.
+
 ## Installation
 
-### Install with pipx
+**Important:** CitraScope requires Python 3.10, 3.11, or 3.12.
 
-[pipx](https://pipx.pypa.io/) installs the CLI tool in an isolated environment while making it globally available:
+### Check Your Python Version
 
 ```sh
-pipx install citrascope
+python3 --version
 ```
 
-### Optional Dependencies
+If you don't have a compatible version, install one with [pyenv](https://github.com/pyenv/pyenv):
 
-CitraScope supports different hardware adapters through optional dependency groups:
+```sh
+pyenv install 3.12.0
+pyenv local 3.12.0  # Sets Python 3.12.0 for the current directory
+```
 
-- **INDI adapter** (for Linux-based telescope control):
-  ```sh
-  pipx install citrascope[indi]
-  # or with pip: pip install citrascope[indi]
-  ```
+### Install CitraScope
 
-- **All optional dependencies**:
-  ```sh
-  pipx install citrascope[all]
-  # or with pip: pip install citrascope[all]
-  ```
+**Recommended: Using pip in a virtual environment**
 
-The base installation without optional dependencies supports the NINA adapter, which works via HTTP API calls and does not require additional Python packages.
+```sh
+python3 -m venv citrascope-env
+source citrascope-env/bin/activate  # On Windows: citrascope-env\Scripts\activate
+pip install citrascope
+```
+
+### Optional Dependencies
+
+For Linux-based telescope control (INDI):
+
+```sh
+pip install citrascope[indi]
+```
 
 This provides the `citrascope` command-line tool. To see available commands:
 
@@ -45,16 +58,18 @@ citrascope --help
 
 ## Usage
 
-Run the CLI tool:
+### Starting the Daemon
+
+Run the daemon with:
 
 ```sh
-citrascope start
+citrascope
 ```
 
-To connect to the Citra Dev server:
+By default, this starts the web interface on `http://localhost:24872`. You can customize the port:
 
 ```sh
-citrascope start --dev
+citrascope --web-port 8080
 ```
 
 ## Developer Setup
@@ -118,10 +133,10 @@ Then create a release in the GitHub UI from the new tag. This triggers automatic
 
 If you are using Visual Studio Code, you can run or debug the project directly using the pre-configured launch options in `.vscode/launch.json`:
 
-- **Python: citrascope dev start** — Runs the main entry point with development options.
-- **Python: citrascope dev start DEBUG logging** — Runs with development options and sets log level to DEBUG for more detailed output.
+- **Python: citrascope** — Runs the daemon with default settings
+- **Python: citrascope (custom port)** — Runs with web interface on port 8080
 
-To use these, open the Run and Debug panel in VS Code, select the desired configuration, and click the Run or Debug button. This is a convenient way to start or debug the app without manually entering commands.
+To use these, open the Run and Debug panel in VS Code, select the desired configuration, and click the Run or Debug button.
 
 ## Running Tests
 

citrascope-0.4.0/citrascope/__main__.py

@@ -0,0 +1,23 @@
+import click
+
+from citrascope.citra_scope_daemon import CitraScopeDaemon
+from citrascope.constants import DEFAULT_WEB_PORT
+from citrascope.settings.citrascope_settings import CitraScopeSettings
+
+
+@click.command()
+@click.option(
+    "--web-port",
+    default=DEFAULT_WEB_PORT,
+    type=int,
+    help=f"Web server port (default: {DEFAULT_WEB_PORT})",
+)
+def cli(web_port):
+    """CitraScope daemon - configure via web UI at http://localhost:24872"""
+    settings = CitraScopeSettings(web_port=web_port)
+    daemon = CitraScopeDaemon(settings)
+    daemon.run()
+
+
+if __name__ == "__main__":
+    cli()

{citrascope-0.3.0 → citrascope-0.4.0}/citrascope/api/citra_api_client.py

@@ -41,7 +41,19 @@ class CitraApiClient(AbstractCitraApiClient):
             return resp.json()
         except httpx.HTTPStatusError as e:
             if self.logger:
-                self.logger.error(f"HTTP error: {e.response.status_code} {e.response.text}")
+                # Check if response is HTML (e.g., Cloudflare error pages)
+                content_type = e.response.headers.get("content-type", "")
+                response_text = e.response.text
+
+                if "text/html" in content_type or response_text.strip().startswith("<"):
+                    # Log only status and a brief message for HTML responses, sometimes we get Cloudflare error pages
+                    self.logger.error(
+                        f"HTTP error: {e.response.status_code} - "
+                        f"Received HTML error page (likely Cloudflare or server error) for {method} {endpoint}"
+                    )
+                else:
+                    # Log full response for non-HTML errors (JSON, plain text, etc.)
+                    self.logger.error(f"HTTP error: {e.response.status_code} {response_text}")
             return None
         except Exception as e:
             if self.logger:

{citrascope-0.3.0 → citrascope-0.4.0}/citrascope/citra_scope_daemon.py

@@ -17,9 +17,6 @@ class CitraScopeDaemon:
         settings: CitraScopeSettings,
         api_client: Optional[AbstractCitraApiClient] = None,
         hardware_adapter: Optional[AbstractAstroHardwareAdapter] = None,
-        enable_web: bool = True,
-        web_host: str = "0.0.0.0",
-        web_port: int = 24872,
     ):
         self.settings = settings
         CITRASCOPE_LOGGER.setLevel(self.settings.log_level)
@@ -33,16 +30,14 @@ class CitraScopeDaemon:
 
         self.api_client = api_client
         self.hardware_adapter = hardware_adapter
-        self.enable_web = enable_web
         self.web_server = None
         self.task_manager = None
         self.ground_station = None
         self.telescope_record = None
         self.configuration_error: Optional[str] = None
 
-        # Create web server instance if enabled (always start web server)
-        if self.enable_web:
-            self.web_server = CitraScopeWebServer(daemon=self, host=web_host, port=web_port)
+        # Create web server instance (always enabled)
+        self.web_server = CitraScopeWebServer(daemon=self, host="0.0.0.0", port=self.settings.web_port)
 
     def _create_hardware_adapter(self) -> AbstractAstroHardwareAdapter:
         """Factory method to create the appropriate hardware adapter based on settings."""
@@ -73,12 +68,8 @@ class CitraScopeDaemon:
         try:
             if reload_settings:
                 CITRASCOPE_LOGGER.info("Reloading configuration...")
-                # Reload settings from file
-                new_settings = CitraScopeSettings(
-                    dev=("dev.api" in self.settings.host),
-                    log_level=self.settings.log_level,
-                    keep_images=self.settings.keep_images,
-                )
+                # Reload settings from file (preserving web_port)
+                new_settings = CitraScopeSettings(web_port=self.settings.web_port)
                 self.settings = new_settings
                 CITRASCOPE_LOGGER.setLevel(self.settings.log_level)
 
@@ -206,11 +197,10 @@ class CitraScopeDaemon:
             return False, error_msg
 
     def run(self):
-        # Start web server FIRST if enabled, so users can monitor/configure
+        # Start web server FIRST, so users can monitor/configure
         # The web interface will remain available even if configuration is incomplete
-        if self.enable_web:
-            self.web_server.start()
-            CITRASCOPE_LOGGER.info(f"Web interface available at http://{self.web_server.host}:{self.web_server.port}")
+        self.web_server.start()
+        CITRASCOPE_LOGGER.info(f"Web interface available at http://{self.web_server.host}:{self.web_server.port}")
 
         try:
             # Try to initialize components
@@ -238,6 +228,7 @@ class CitraScopeDaemon:
         """Clean up resources on shutdown."""
         if self.task_manager:
             self.task_manager.stop()
-        if self.enable_web and self.web_server:
+        if self.web_server:
             CITRASCOPE_LOGGER.info("Stopping web server...")
-            self.web_server.stop()
+            if self.web_server.web_log_handler:
+                CITRASCOPE_LOGGER.removeHandler(self.web_server.web_log_handler)

citrascope-0.4.0/citrascope/constants.py

@@ -0,0 +1,23 @@
+"""Application-wide constants for CitraScope.
+
+This module contains all shared constants used across different parts of the application.
+Centralizing these values prevents duplication and circular import issues.
+"""
+
+# ============================================================================
+# API ENDPOINTS
+# ============================================================================
+PROD_API_HOST = "api.citra.space"
+DEV_API_HOST = "dev.api.citra.space"
+DEFAULT_API_PORT = 443
+
+# ============================================================================
+# WEB APP URLs
+# ============================================================================
+PROD_APP_URL = "https://app.citra.space"
+DEV_APP_URL = "https://dev.app.citra.space"
+
+# ============================================================================
+# WEB SERVER
+# ============================================================================
+DEFAULT_WEB_PORT = 24872  # "CITRA" on phone keypad

{citrascope-0.3.0 → citrascope-0.4.0}/citrascope/hardware/nina_adv_http_adapter.py

@@ -422,8 +422,8 @@ class NinaAdvancedHttpAdapter(AbstractAstroHardwareAdapter):
 
         nina_sequence_name = f"Citra Target: {satellite_data['name']}, Task: {task_id}"
 
-        # Replace basic placeholders
-        tle_data = f"{elset['tle'][0]}\n{elset['tle'][1]}"
+        # Replace basic placeholders (use \r\n for Windows NINA compatibility)
+        tle_data = f"{elset['tle'][0]}\r\n{elset['tle'][1]}"
         sequence_json["Name"] = nina_sequence_name
 
         # Navigate to the TLE container (ID 20 in the template)

{citrascope-0.3.0 → citrascope-0.4.0}/citrascope/logging/web_log_handler.py

@@ -23,14 +23,15 @@ class WebLogHandler(logging.Handler):
     def emit(self, record):
         """Emit a log record."""
         try:
-            # Filter out web-related logs from the web UI
-            # (uvicorn.access, WebSocket messages, HTTP Request logs, etc.)
-            if (
-                record.name.startswith("uvicorn")
-                or "WebSocket" in record.getMessage()
-                or "HTTP Request:" in record.getMessage()
-            ):
-                return
+            # Filter out routine web-related logs from the web UI
+            # but keep ERROR and CRITICAL level messages
+            if record.levelno < logging.ERROR:
+                if (
+                    record.name.startswith("uvicorn")
+                    or "WebSocket" in record.getMessage()
+                    or "HTTP Request:" in record.getMessage()
+                ):
+                    return
 
             # Get the original levelname without color codes
             # Record.levelname might have ANSI codes from ColoredFormatter

{citrascope-0.3.0 → citrascope-0.4.0}/citrascope/settings/citrascope_settings.py

@@ -10,6 +10,7 @@ import platformdirs
 APP_NAME = "citrascope"
 APP_AUTHOR = "citra-space"
 
+from citrascope.constants import DEFAULT_API_PORT, DEFAULT_WEB_PORT, PROD_API_HOST
 from citrascope.logging import CITRASCOPE_LOGGER
 from citrascope.settings.settings_file_manager import SettingsFileManager
 
@@ -17,18 +18,11 @@ from citrascope.settings.settings_file_manager import SettingsFileManager
 class CitraScopeSettings:
     """Settings for CitraScope loaded from JSON configuration file."""
 
-    def __init__(
-        self,
-        dev: bool = False,
-        log_level: str = "INFO",
-        keep_images: bool = False,
-    ):
+    def __init__(self, web_port: int = DEFAULT_WEB_PORT):
         """Initialize settings from JSON config file.
 
         Args:
-            dev: If True, use development API endpoint
-            log_level: Logging level (DEBUG, INFO, WARNING, ERROR)
-            keep_images: If True, preserve captured images
+            web_port: Port for web interface (default: 24872) - bootstrap option only
         """
         self.config_manager = SettingsFileManager()
 
@@ -38,9 +32,9 @@ class CitraScopeSettings:
         # Application data directories
         self._images_dir = Path(platformdirs.user_data_dir(APP_NAME, appauthor=APP_AUTHOR)) / "images"
 
-        # API Settings
-        self.host: str = config.get("host", "dev.api.citra.space" if dev else "api.citra.space")
-        self.port: int = config.get("port", 443)
+        # API Settings (all loaded from config file)
+        self.host: str = config.get("host", PROD_API_HOST)
+        self.port: int = config.get("port", DEFAULT_API_PORT)
         self.use_ssl: bool = config.get("use_ssl", True)
         self.personal_access_token: str = config.get("personal_access_token", "")
         self.telescope_id: str = config.get("telescope_id", "")
@@ -51,9 +45,12 @@ class CitraScopeSettings:
         # Hardware adapter-specific settings stored as dict
         self.adapter_settings: Dict[str, Any] = config.get("adapter_settings", {})
 
-        # Runtime settings (can be overridden by CLI flags)
-        self.log_level: str = log_level if log_level != "INFO" else config.get("log_level", "INFO")
-        self.keep_images: bool = keep_images if keep_images else config.get("keep_images", False)
+        # Runtime settings (all loaded from config file, configurable via web UI)
+        self.log_level: str = config.get("log_level", "INFO")
+        self.keep_images: bool = config.get("keep_images", False)
+
+        # Web port: CLI override if non-default, otherwise use config file
+        self.web_port: int = web_port if web_port != DEFAULT_WEB_PORT else config.get("web_port", DEFAULT_WEB_PORT)
 
         # Task retry configuration
         self.max_task_retries: int = config.get("max_task_retries", 3)
@@ -64,10 +61,6 @@ class CitraScopeSettings:
         self.file_logging_enabled: bool = config.get("file_logging_enabled", True)
         self.log_retention_days: int = config.get("log_retention_days", 30)
 
-        if dev:
-            self.host = "dev.api.citra.space"
-            CITRASCOPE_LOGGER.info("Using development API endpoint.")
-
     def get_images_dir(self) -> Path:
         """Get the path to the images directory.
 
@@ -105,6 +98,7 @@ class CitraScopeSettings:
             "adapter_settings": self.adapter_settings,
             "log_level": self.log_level,
             "keep_images": self.keep_images,
+            "web_port": self.web_port,
             "max_task_retries": self.max_task_retries,
             "initial_retry_delay_seconds": self.initial_retry_delay_seconds,
             "max_retry_delay_seconds": self.max_retry_delay_seconds,
@@ -137,6 +131,7 @@ class CitraScopeSettings:
         settings.adapter_settings = config.get("adapter_settings", {})
         settings.log_level = config.get("log_level", "INFO")
         settings.keep_images = config.get("keep_images", False)
+        settings.web_port = config.get("web_port", DEFAULT_WEB_PORT)
         settings.max_task_retries = config.get("max_task_retries", 3)
         settings.initial_retry_delay_seconds = config.get("initial_retry_delay_seconds", 30)
         settings.max_retry_delay_seconds = config.get("max_retry_delay_seconds", 300)

{citrascope-0.3.0 → citrascope-0.4.0}/citrascope/tasks/runner.py

@@ -11,6 +11,9 @@ from citrascope.tasks.scope.static_telescope_task import StaticTelescopeTask
 from citrascope.tasks.scope.tracking_telescope_task import TrackingTelescopeTask
 from citrascope.tasks.task import Task
 
+# Task polling interval in seconds
+TASK_POLL_INTERVAL_SECONDS = 15
+
 
 class TaskManager:
     def __init__(
@@ -44,8 +47,9 @@ class TaskManager:
                 self._report_online()
                 tasks = self.api_client.get_telescope_tasks(self.telescope_record["id"])
 
-                # If API call failed (timeout, network error, etc.), skip this poll iteration
+                # If API call failed (timeout, network error, etc.), wait before retrying
                 if tasks is None:
+                    self._stop_event.wait(TASK_POLL_INTERVAL_SECONDS)
                     continue
 
                 added = 0
@@ -113,7 +117,7 @@ class TaskManager:
             except Exception as e:
                 self.logger.error(f"Exception in poll_tasks loop: {e}", exc_info=True)
                 time.sleep(5)  # avoid tight error loop
-            self._stop_event.wait(15)
+            self._stop_event.wait(TASK_POLL_INTERVAL_SECONDS)
 
     def _report_online(self):
         """

{citrascope-0.3.0 → citrascope-0.4.0}/citrascope/web/app.py

@@ -4,6 +4,7 @@ import asyncio
 import json
 import os
 from datetime import datetime, timezone
+from importlib.metadata import PackageNotFoundError, version
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
@@ -13,15 +14,14 @@ from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi.staticfiles import StaticFiles
 from pydantic import BaseModel
 
+from citrascope.constants import (
+    DEV_API_HOST,
+    DEV_APP_URL,
+    PROD_API_HOST,
+    PROD_APP_URL,
+)
 from citrascope.logging import CITRASCOPE_LOGGER
 
-# ============================================================================
-# URL CONSTANTS - Single source of truth for Citra web URLs
-# ============================================================================
-PROD_APP_URL = "https://app.citra.space"
-DEV_APP_URL = "https://dev.app.citra.space"
-# ============================================================================
-
 
 class SystemStatus(BaseModel):
     """Current system status."""
@@ -155,7 +155,7 @@ class CitraScopeWebApp:
 
             settings = self.daemon.settings
             # Determine app URL based on API host
-            app_url = DEV_APP_URL if "dev." in settings.host else PROD_APP_URL
+            app_url = DEV_APP_URL if settings.host == DEV_API_HOST else PROD_APP_URL
 
             # Get config file path
             config_path = str(settings.config_manager.get_config_path())
@@ -198,6 +198,15 @@ class CitraScopeWebApp:
                 "error": getattr(self.daemon, "configuration_error", None),
             }
 
+        @self.app.get("/api/version")
+        async def get_version():
+            """Get CitraScope version."""
+            try:
+                pkg_version = version("citrascope")
+                return {"version": pkg_version}
+            except PackageNotFoundError:
+                return {"version": "development"}
+
         @self.app.get("/api/hardware-adapters")
         async def get_hardware_adapters():
             """Get list of available hardware adapters."""

{citrascope-0.3.0 → citrascope-0.4.0}/citrascope/web/server.py

@@ -7,13 +7,14 @@ import time
 
 import uvicorn
 
+from citrascope.constants import DEFAULT_WEB_PORT
 from citrascope.logging import CITRASCOPE_LOGGER, WebLogHandler
 
 
 class CitraScopeWebServer:
     """Manages the web server and its configuration."""
 
-    def __init__(self, daemon, host: str = "0.0.0.0", port: int = 24872):
+    def __init__(self, daemon, host: str = "0.0.0.0", port: int = DEFAULT_WEB_PORT):
         self.daemon = daemon
         self.host = host
         self.port = port
@@ -101,6 +102,14 @@ class CitraScopeWebServer:
             asyncio.create_task(self._status_broadcast_loop())
 
             await server.serve()
+        except OSError as e:
+            if e.errno == 48:  # Address already in use
+                CITRASCOPE_LOGGER.error(
+                    f"Port {self.port} is already in use. Please stop any other services using this port "
+                    f"or use --web-port to specify a different port."
+                )
+            else:
+                CITRASCOPE_LOGGER.error(f"Web server OS error: {e}", exc_info=True)
         except Exception as e:
             CITRASCOPE_LOGGER.error(f"Web server error: {e}", exc_info=True)
 

{citrascope-0.3.0 → citrascope-0.4.0}/citrascope/web/static/app.js

@@ -412,12 +412,14 @@ function updateLatestLogLine() {
 
         const timestamp = new Date(latestLog.timestamp).toLocaleTimeString();
         const cleanMessage = stripAnsiCodes(latestLog.message);
+        // Truncate message to ~150 chars for collapsed header (approx 2 lines)
+        const truncatedMessage = cleanMessage.length > 150 ? cleanMessage.substring(0, 150) + '...' : cleanMessage;
 
         content.querySelector('.log-timestamp').textContent = timestamp;
         const levelSpan = content.querySelector('.log-level');
         levelSpan.classList.add(`log-level-${latestLog.level}`);
         levelSpan.textContent = latestLog.level;
-        content.querySelector('.log-message').textContent = cleanMessage;
+        content.querySelector('.log-message').textContent = truncatedMessage;
 
         latestLogLine.innerHTML = '';
         latestLogLine.appendChild(content);

{citrascope-0.3.0 → citrascope-0.4.0}/citrascope/web/static/config.js

@@ -2,12 +2,34 @@
 
 import { getConfig, saveConfig, getConfigStatus, getHardwareAdapters, getAdapterSchema } from './api.js';
 
+// API Host constants - must match backend constants in app.py
+const PROD_API_HOST = 'api.citra.space';
+const DEV_API_HOST = 'dev.api.citra.space';
+const DEFAULT_API_PORT = 443;
+
 let currentAdapterSchema = [];
 export let currentConfig = {};
 
 /**
  * Initialize configuration management
  */
+async function fetchVersion() {
+    try {
+        const response = await fetch('/api/version');
+        const data = await response.json();
+        const versionEl = document.getElementById('citraScopeVersion');
+        if (versionEl && data.version) {
+            versionEl.textContent = data.version;
+        }
+    } catch (error) {
+        console.error('Error fetching version:', error);
+        const versionEl = document.getElementById('citraScopeVersion');
+        if (versionEl) {
+            versionEl.textContent = 'unknown';
+        }
+    }
+}
+
 export async function initConfig() {
     // Populate hardware adapter dropdown
     await loadAdapterOptions();
@@ -25,6 +47,19 @@ export async function initConfig() {
         });
     }
 
+    // API endpoint selection change
+    const apiEndpointSelect = document.getElementById('apiEndpoint');
+    if (apiEndpointSelect) {
+        apiEndpointSelect.addEventListener('change', function(e) {
+            const customContainer = document.getElementById('customHostContainer');
+            if (e.target.value === 'custom') {
+                customContainer.style.display = 'block';
+            } else {
+                customContainer.style.display = 'none';
+            }
+        });
+    }
+
     // Config form submission
     const configForm = document.getElementById('configForm');
     if (configForm) {
@@ -34,6 +69,7 @@ export async function initConfig() {
     // Load initial config
     await loadConfiguration();
     checkConfigStatus();
+    fetchVersion();
 }
 
 /**
@@ -114,6 +150,27 @@ async function loadConfiguration() {
             imagesDirElement.textContent = config.images_dir_path;
         }
 
+        // API endpoint selector
+        const apiEndpointSelect = document.getElementById('apiEndpoint');
+        const customHostContainer = document.getElementById('customHostContainer');
+        const customHost = document.getElementById('customHost');
+        const customPort = document.getElementById('customPort');
+        const customUseSsl = document.getElementById('customUseSsl');
+
+        if (config.host === PROD_API_HOST) {
+            apiEndpointSelect.value = 'production';
+            customHostContainer.style.display = 'none';
+        } else if (config.host === DEV_API_HOST) {
+            apiEndpointSelect.value = 'development';
+            customHostContainer.style.display = 'none';
+        } else {
+            apiEndpointSelect.value = 'custom';
+            customHostContainer.style.display = 'block';
+            customHost.value = config.host || '';
+            customPort.value = config.port || DEFAULT_API_PORT;
+            customUseSsl.checked = config.use_ssl !== undefined ? config.use_ssl : true;
+        }
+
         // Core fields
         document.getElementById('personal_access_token').value = config.personal_access_token || '';
         document.getElementById('telescopeId').value = config.telescope_id || '';
@@ -274,6 +331,24 @@ async function saveConfiguration(event) {
     // Hide previous messages
     hideConfigMessages();
 
+    // Determine API host settings based on endpoint selection
+    const apiEndpoint = document.getElementById('apiEndpoint').value;
+    let host, port, use_ssl;
+
+    if (apiEndpoint === 'production') {
+        host = PROD_API_HOST;
+        port = DEFAULT_API_PORT;
+        use_ssl = true;
+    } else if (apiEndpoint === 'development') {
+        host = DEV_API_HOST;
+        port = DEFAULT_API_PORT;
+        use_ssl = true;
+    } else { // custom
+        host = document.getElementById('customHost').value;
+        port = parseInt(document.getElementById('customPort').value, 10);
+        use_ssl = document.getElementById('customUseSsl').checked;
+    }
+
     const config = {
         personal_access_token: document.getElementById('personal_access_token').value,
         telescope_id: document.getElementById('telescopeId').value,
@@ -282,10 +357,11 @@ async function saveConfiguration(event) {
         log_level: document.getElementById('logLevel').value,
         keep_images: document.getElementById('keep_images').checked,
         file_logging_enabled: document.getElementById('file_logging_enabled').checked,
-        // Preserve API settings from loaded config
-        host: currentConfig.host || 'api.citra.space',
-        port: currentConfig.port || 443,
-        use_ssl: currentConfig.use_ssl !== undefined ? currentConfig.use_ssl : true,
+        // API settings from endpoint selector
+        host: host,
+        port: port,
+        use_ssl: use_ssl,
+        // Preserve other settings from loaded config
         max_task_retries: currentConfig.max_task_retries || 3,
         initial_retry_delay_seconds: currentConfig.initial_retry_delay_seconds || 30,
         max_retry_delay_seconds: currentConfig.max_retry_delay_seconds || 300,

{citrascope-0.3.0 → citrascope-0.4.0}/citrascope/web/static/style.css

@@ -57,6 +57,29 @@ body {
 /* Log accordion customization */
 .log-accordion-button {
     border-bottom: 1px solid #444 !important;
+    position: relative;
+}
+
+.accordion-social-links {
+    position: absolute;
+    right: 50px; /* Position to the left of the accordion arrow */
+    top: 50%;
+    transform: translateY(-50%);
+    display: flex;
+    gap: 12px;
+    align-items: center;
+}
+
+.social-link {
+    color: #a0aec0;
+    transition: color 0.2s ease;
+    display: flex;
+    align-items: center;
+    text-decoration: none;
+}
+
+.social-link:hover {
+    color: #e2e8f0;
 }
 
 .log-accordion-body {
@@ -72,6 +95,15 @@ body {
 .log-latest-line {
     font-family: monospace;
     color: #e2e8f0;
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    line-height: 1.4em;
+    max-height: 2.8em;
+    padding-right: 130px; /* Make room for 3 social icons and accordion arrow */
 }
 
 /* Task display */

{citrascope-0.3.0 → citrascope-0.4.0}/citrascope/web/templates/dashboard.html

@@ -34,6 +34,7 @@
                 <li class="nav-item"><a href="#" class="nav-link px-2 text-white" data-section="monitoring"
                         aria-current="page">Monitoring</a></li>
                 <li class="nav-item"><a href="#" class="nav-link px-2" data-section="config">Config</a></li>
+                <li class="nav-item"><a href="https://docs.citra.space/citrascope/" class="nav-link px-2" target="_blank">Docs</a></li>
                 <li class="nav-item"><a href="#" class="nav-link bg-success text-white btn" style="display: none;"
                         id="taskScopeButton" target="_blank">Task my Scope</a></li>
             </ul>
@@ -165,6 +166,32 @@
                         </div>
                         <div class="card-body">
                             <div class="row g-3">
+                                <div class="col-12">
+                                    <label for="apiEndpoint" class="form-label">API Endpoint</label>
+                                    <select id="apiEndpoint" class="form-select">
+                                        <option value="production">Production (api.citra.space)</option>
+                                        <option value="development">Development (dev.api.citra.space)</option>
+                                        <option value="custom">Custom</option>
+                                    </select>
+                                </div>
+                                <div class="col-12" id="customHostContainer" style="display: none;">
+                                    <label for="customHost" class="form-label">Custom API Host</label>
+                                    <input type="text" id="customHost" class="form-control" placeholder="api.example.com">
+                                    <div class="row g-2 mt-2">
+                                        <div class="col-6">
+                                            <label for="customPort" class="form-label small">Port</label>
+                                            <input type="number" id="customPort" class="form-control" value="443" placeholder="443">
+                                        </div>
+                                        <div class="col-6 d-flex align-items-end">
+                                            <div class="form-check">
+                                                <input class="form-check-input" type="checkbox" id="customUseSsl" checked>
+                                                <label class="form-check-label" for="customUseSsl">
+                                                    Use SSL
+                                                </label>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                                 <div class="col-12 col-md-6">
                                     <label for="personal_access_token" class="form-label">Personal Access Token <span class="text-danger">*</span></label>
                                     <input type="password" id="personal_access_token" class="form-control" placeholder="Enter your Citra API token" required>
@@ -277,6 +304,15 @@
                     </small>
                 </div>
             </div>
+
+            <!-- Version Info -->
+            <div class="row mt-3">
+                <div class="col">
+                    <small class="text-muted">
+                        CitraScope Version: <span id="citraScopeVersion" class="text-secondary">Loading...</span>
+                    </small>
+                </div>
+            </div>
         </form>
     </div>
 
@@ -315,6 +351,23 @@
                         data-bs-toggle="collapse" data-bs-target="#logAccordionCollapse" aria-expanded="false"
                         aria-controls="logAccordionCollapse">
                         <span id="latestLogLine" class="log-latest-line">Log Terminal</span>
+                        <div class="accordion-social-links">
+                            <a href="https://github.com/citra-space/citrascope/issues/new" target="_blank" class="social-link" title="Report an Issue" onclick="event.stopPropagation();">
+                                <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" viewBox="0 0 16 16">
+                                    <path d="M16 8c0 3.866-3.582 7-8 7a9 9 0 0 1-2.347-.306c-.584.296-1.925.864-4.181 1.234-.2.032-.352-.176-.273-.362.354-.836.674-1.95.77-2.966C.744 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7M5 8a1 1 0 1 0-2 0 1 1 0 0 0 2 0m4 0a1 1 0 1 0-2 0 1 1 0 0 0 2 0m3 1a1 1 0 1 0 0-2 1 1 0 0 0 0 2"/>
+                                </svg>
+                            </a>
+                            <a href="https://discord.gg/STgJQkWe9y" target="_blank" class="social-link" title="Join Discord" onclick="event.stopPropagation();">
+                                <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" viewBox="0 0 16 16">
+                                    <path d="M13.545 2.907a13.227 13.227 0 0 0-3.257-1.011.05.05 0 0 0-.052.025c-.141.25-.297.577-.406.833a12.19 12.19 0 0 0-3.658 0 8.258 8.258 0 0 0-.412-.833.051.051 0 0 0-.052-.025c-1.125.194-2.22.534-3.257 1.011a.041.041 0 0 0-.021.018C.356 6.024-.213 9.047.066 12.032c.001.014.01.028.021.037a13.276 13.276 0 0 0 3.995 2.02.05.05 0 0 0 .056-.019c.308-.42.582-.863.818-1.329a.05.05 0 0 0-.01-.059.051.051 0 0 0-.018-.011 8.875 8.875 0 0 1-1.248-.595.05.05 0 0 1-.02-.066.051.051 0 0 1 .015-.019c.084-.063.168-.129.248-.195a.05.05 0 0 1 .051-.007c2.619 1.196 5.454 1.196 8.041 0a.052.052 0 0 1 .053.007c.08.066.164.132.248.195a.051.051 0 0 1-.004.085 8.254 8.254 0 0 1-1.249.594.05.05 0 0 0-.03.03.052.052 0 0 0 .003.041c.24.465.515.909.817 1.329a.05.05 0 0 0 .056.019 13.235 13.235 0 0 0 4.001-2.02.049.049 0 0 0 .021-.037c.334-3.451-.559-6.449-2.366-9.106a.034.034 0 0 0-.02-.019Zm-8.198 7.307c-.789 0-1.438-.724-1.438-1.612 0-.889.637-1.613 1.438-1.613.807 0 1.45.73 1.438 1.613 0 .888-.637 1.612-1.438 1.612Zm5.316 0c-.788 0-1.438-.724-1.438-1.612 0-.889.637-1.613 1.438-1.613.807 0 1.451.73 1.438 1.613 0 .888-.631 1.612-1.438 1.612Z"/>
+                                </svg>
+                            </a>
+                            <a href="https://github.com/citra-space/citrascope" target="_blank" class="social-link" title="View on GitHub" onclick="event.stopPropagation();">
+                                <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" viewBox="0 0 16 16">
+                                    <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z"/>
+                                </svg>
+                            </a>
+                        </div>
                     </button>
                 </h2>
                 <div id="logAccordionCollapse" class="accordion-collapse collapse" aria-labelledby="logAccordionHeader"

{citrascope-0.3.0 → citrascope-0.4.0}/pyproject.toml

@@ -1,21 +1,17 @@
 [project]
 name = "citrascope"
-version = "0.3.0"
+version = "0.4.0"
 description = "Remotely control a telescope while it polls for tasks, collects and edge processes data, and delivers results and data for further processing."
 readme = "README.md"
 requires-python = ">=3.10,<3.13"
 license = "MIT"
 authors = [{ name = "Patrick McDavid", email = "patrick@citra.space" }]
 dependencies = [
-  "pydantic-settings",
-  "python-json-logger",
   "click",
   "requests",
   "httpx",
   "python-dateutil",
-  "types-python-dateutil",
   "skyfield",
-  "pytest-cov",
   "fastapi>=0.104.0",
   "uvicorn[standard]>=0.24.0",
   "websockets>=12.0",
@@ -42,6 +38,7 @@ dev = [
   "pre-commit",
   "isort",
   "mypy",
+  "types-python-dateutil",
   "flake8",
   "flake8-pytest-style",
   "bump-my-version",
@@ -49,16 +46,12 @@ dev = [
 ]
 test = ["pytest", "pytest-cov", "mockito"]
 build = ["build"]
-docs = ["sphinx", "sphinx-autodoc-typehints", "sphinx-markdown-builder"]
 deploy = ["twine"]
 
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
-[tool.hatch.build.force-include]
-"docs" = "docs"
-
 [tool.black]
 line-length = 120
 force-exclude = '''
@@ -97,7 +90,7 @@ omit = ["tests/*", "__init__.py"]
 allow-direct-references = true
 
 [tool.bumpversion]
-current_version = "0.3.0"
+current_version = "0.4.0"
 commit = true
 tag = true
 

citrascope-0.3.0/citrascope/__main__.py

@@ -1,26 +0,0 @@
-import click
-
-from citrascope.citra_scope_daemon import CitraScopeDaemon
-from citrascope.settings.citrascope_settings import CitraScopeSettings
-
-
-@click.group()
-@click.option("--dev", is_flag=True, default=False, help="Use the development API (dev.app.citra.space)")
-@click.option("--log-level", default="INFO", help="Set logging level (DEBUG, INFO, WARNING, ERROR, CRITICAL)")
-@click.option("--keep-images", is_flag=True, default=False, help="Keep image files after upload (do not delete)")
-@click.pass_context
-def cli(ctx, dev, log_level, keep_images):
-    ctx.obj = {"settings": CitraScopeSettings(dev=dev, log_level=log_level, keep_images=keep_images)}
-
-
-@cli.command("start")
-@click.option("--web-host", default="0.0.0.0", help="Web server host address (default: 0.0.0.0)")
-@click.option("--web-port", default=24872, type=int, help="Web server port (default: 24872)")
-@click.pass_context
-def start(ctx, web_host, web_port):
-    daemon = CitraScopeDaemon(ctx.obj["settings"], enable_web=True, web_host=web_host, web_port=web_port)
-    daemon.run()
-
-
-if __name__ == "__main__":
-    cli()

citrascope-0.3.0/docs/index.md

@@ -1,47 +0,0 @@
-# CitraScope Documentation
-
-Welcome to the CitraScope documentation.
-
-## Overview
-
-CitraScope is a Python application for remote telescope control, task automation, and data collection.
-It connects to the Citra.space API and INDI hardware to execute observation tasks.
-
-## Architecture
-
-- **CLI Entrypoint:** `citrascope/__main__.py`
-  Handles configuration, authentication, and starts the task daemon.
-- **API Client:** `citrascope/api/client.py`
-  Communicates with Citra.space for authentication, telescope, satellite, and ground station data.
-- **Task Management:** `citrascope/tasks/runner.py`
-  Polls for tasks, schedules, and executes observations.
-- **Settings:** `citrascope/settings/_citrascope_settings.py`
-  Loads configuration from environment variables.
-
-## Configuration
-
-See [README.md](../README.md) for installation and environment setup.
-Environment variables are documented in `.env.example`.
-
-## Usage
-
-Run the CLI:
-```sh
-python -m citrascope start
-```
-Or use VS Code launch configurations for development and debugging.
-
-## Testing
-
-- **Unit tests** are written using [pytest](https://pytest.org/) and are located in the `tests/` directory.
-- To run tests manually, use:
-
-  ```bash
-  pytest
-  ```
-
-## Further Documentation
-
-- [API Reference](https://api.citra.space/docs)
-- [Contributing Guide](contributing.md) (coming soon)
-- [Troubleshooting](troubleshooting.md) (coming soon)