citrascope 0.1.0__tar.gz → 0.4.0__tar.gz

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

@@ -12,12 +12,19 @@ This project is a Python package for interacting with astronomical data and serv
 
 ## Directory Structure
 - `citrascope/api/`: API client code
-- `citrascope/indi/`: INDI client integration
+- `citrascope/hardware/`: Hardware adapter implementations and registry
+  - `adapter_registry.py`: Central registry for all hardware adapters (add new adapters here)
+  - `abstract_astro_hardware_adapter.py`: Base class all adapters must implement
+  - Individual adapter implementations (indi_adapter.py, nina_adv_http_adapter.py, etc.)
 - `citrascope/logging/`: Logging utilities
 - `citrascope/settings/`: Settings and configuration
 - `citrascope/tasks/`: Task runner and definitions
+- `citrascope/web/`: Web interface for monitoring and configuration
+  - `citrascope/web/app.py`: FastAPI application and routes
+  - `citrascope/web/server.py`: Web server management and threading
+  - `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/`.
@@ -32,17 +39,44 @@ This project is a Python package for interacting with astronomical data and serv
 
 ## Common Tasks
 - Add new API integrations in `citrascope/api/`.
-- Extend INDI client features in `citrascope/indi/`.
+- Extend or add hardware adapters:
+  - Create new adapter class implementing `AbstractAstroHardwareAdapter` in `citrascope/hardware/`
+  - Register it in `citrascope/hardware/adapter_registry.py` by adding an entry to `REGISTERED_ADAPTERS`
+  - All adapter discovery and instantiation flows from this registry
 - Update logging logic in `citrascope/logging/`.
 - Change settings in `citrascope/settings/`.
 - Add or modify tasks in `citrascope/tasks/`.
+- Enhance web interface in `citrascope/web/`.
 - Write or update tests in `tests/`.
 
+## Web Interface Guidelines
+
+The web interface provides real-time monitoring and configuration for telescope operations. When working on web-related features:
+
+### Design Principles
+- **Dark theme required**: All UI elements must use dark colors suitable for nighttime telescope operations to preserve night vision
+- **Real-time updates**: Use WebSocket connections for live status, logs, and telemetry
+- **Mobile-friendly**: The interface should be responsive and usable on tablets/phones in the field
+- **Minimal distractions**: Reduce visual clutter; prioritize essential telescope and task information
+
+### Architecture
+- **FastAPI backend** (`web/app.py`): RESTful API endpoints and WebSocket handlers
+- **Separate thread**: Web server runs in daemon thread with its own event loop (`web/server.py`)
+- **Log streaming**: Custom `WebLogHandler` broadcasts logs to web clients in real-time
+- **Static files**: HTML, CSS, and JavaScript are served from `web/templates/` and `web/static/`
+
+### Development Notes
+- Keep web-specific code isolated in the `citrascope/web/` directory
+- The daemon should only call `web_server.start()` - all web complexity stays in `web/server.py`
+- Filter out noise from web logs (HTTP requests, WebSocket events, Uvicorn messages)
+- Use thread-safe mechanisms when accessing daemon state from web handlers
+- Port 24872 (CITRA on phone keypad) is the default web interface port
+
 ## Important Packages
 
 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.
@@ -58,9 +92,14 @@ This project relies on several key Python packages. Below are some of the most i
 - **Flake8**: Enforces code style and linting rules.
 - **Sphinx**: Generates project documentation.
 
+### Web Interface Dependencies
+- **FastAPI**: Modern async web framework for the monitoring interface
+- **Uvicorn**: ASGI server for running the web application
+- **WebSockets**: Real-time bidirectional communication for live updates
+
 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.1.0/.github/workflows/publish.yml → citrascope-0.4.0/.github/workflows/pypi-publish.yml

@@ -1,4 +1,4 @@
-name: Publish Python 🐍 package
+name: Publish Python Package
 
 on:
   release:

{citrascope-0.1.0 → citrascope-0.4.0}/.github/workflows/pytest.yml

@@ -9,24 +9,29 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ['3.10', '3.11', '3.12']
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: Set up Python
+      - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: ${{ matrix.python-version }}
       - name: Install project prerequisites
         run: sudo apt-get update && sudo apt-get install -y libglib2.0-dev libdbus-1-dev libjpeg-dev zlib1g-dev
       - name: Install dependencies
         run: |
           pip install --upgrade pip
-          pip install .[dev,test]
+          pip install .[dev,test,indi,all]
       - name: Run pytest with coverage
         run: |
-          pytest --cov=citrascope --cov-report=term-missing --cov-report=xml --cov-branch
+          pytest -m "not integration" --cov=citrascope --cov-report=term-missing --cov-report=xml --cov-branch
       - name: Upload coverage report
         uses: actions/upload-artifact@v4
+        if: matrix.python-version == '3.12'
         with:
           name: coverage-xml
           path: coverage.xml

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

@@ -68,9 +68,6 @@ instance/
 # Scrapy stuff:
 .scrapy
 
-# Sphinx documentation
-docs/build/
-
 # PyBuilder
 target/
 
@@ -81,9 +78,6 @@ target/
 profile_default/
 ipython_config.py
 
-# pyenv
-.python-version
-
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
 #   However, in case of collaboration, if having platform-specific dependencies or dependencies
@@ -141,3 +135,5 @@ citra_image.fits
 /images/*
 .DS_Store
 hip_main.dat
+nina_sequence_*.json
+nina_focus_positions.json

citrascope-0.4.0/.python-version

@@ -0,0 +1 @@
+3.12

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

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

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

@@ -1,27 +1,31 @@
 Metadata-Version: 2.4
 Name: citrascope
-Version: 0.1.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: Christopher Stevens <chris@citra.space>
+Author-email: Patrick McDavid <patrick@citra.space>
 License-Expression: MIT
-Requires-Python: >=3.9
+Requires-Python: <3.13,>=3.10
 Requires-Dist: click
+Requires-Dist: fastapi>=0.104.0
 Requires-Dist: httpx
-Requires-Dist: pixelemon
-Requires-Dist: pydantic-settings
-Requires-Dist: pyindi-client
-Requires-Dist: pytest-cov
+Requires-Dist: platformdirs>=4.0.0
 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
+Requires-Dist: dbus-python; extra == 'all'
+Requires-Dist: pixelemon; extra == 'all'
+Requires-Dist: plotly; extra == 'all'
+Requires-Dist: pyindi-client; extra == 'all'
 Provides-Extra: build
 Requires-Dist: build; extra == 'build'
 Provides-Extra: deploy
 Requires-Dist: twine; extra == 'deploy'
 Provides-Extra: dev
 Requires-Dist: black; extra == 'dev'
+Requires-Dist: bump-my-version; extra == 'dev'
 Requires-Dist: flake8; extra == 'dev'
 Requires-Dist: flake8-pytest-style; extra == 'dev'
 Requires-Dist: isort; extra == 'dev'
@@ -30,10 +34,13 @@ 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'
+Requires-Dist: pyindi-client; extra == 'indi'
+Provides-Extra: kstars
+Requires-Dist: dbus-python; extra == 'kstars'
 Provides-Extra: test
 Requires-Dist: mockito; extra == 'test'
 Requires-Dist: pytest; extra == 'test'
@@ -41,68 +48,78 @@ Requires-Dist: pytest-cov; extra == 'test'
 Description-Content-Type: text/markdown
 
 # CitraScope
-[![Pytest](https://github.com/citra-space/citrascope/actions/workflows/pytest.yml/badge.svg)](https://github.com/citra-space/citrascope/actions/workflows/pytest.yml) [![Build and Push Docker Image](https://github.com/citra-space/citrascope/actions/workflows/docker-publish.yml/badge.svg)](https://github.com/citra-space/citrascope/actions/workflows/docker-publish.yml)
+[![Pytest](https://github.com/citra-space/citrascope/actions/workflows/pytest.yml/badge.svg)](https://github.com/citra-space/citrascope/actions/workflows/pytest.yml) [![Publish Python Package](https://github.com/citra-space/citrascope/actions/workflows/pypi-publish.yml/badge.svg)](https://github.com/citra-space/citrascope/actions/workflows/pypi-publish.yml)
 
 Remotely control a telescope while it polls for tasks, collects observations, and delivers data for further processing.
 
 ## Features
-
+- Offers a web UI to configure hardware and connect to Citra.space's api
 - Connects to Citra.space's API and identifies itself as an online telescope
-- Connects to configured INDI telescope and camera hardware
+- 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 CitraScope from PyPI:
+**Important:** CitraScope requires Python 3.10, 3.11, or 3.12.
+
+### Check Your Python Version
 
 ```sh
-pip install citrascope
+python3 --version
 ```
 
-This provides the `citrascope` command-line tool. To see available commands:
+If you don't have a compatible version, install one with [pyenv](https://github.com/pyenv/pyenv):
 
 ```sh
-citrascope --help
+pyenv install 3.12.0
+pyenv local 3.12.0  # Sets Python 3.12.0 for the current directory
 ```
 
-## Usage
+### Install CitraScope
 
-Run the CLI tool:
+**Recommended: Using pip in a virtual environment**
 
 ```sh
-citrascope start
+python3 -m venv citrascope-env
+source citrascope-env/bin/activate  # On Windows: citrascope-env\Scripts\activate
+pip install citrascope
 ```
 
-To connect to the Citra Dev server:
+### Optional Dependencies
+
+For Linux-based telescope control (INDI):
 
 ```sh
-citrascope start --dev
+pip install citrascope[indi]
 ```
 
-## Configuration
+This provides the `citrascope` command-line tool. To see available commands:
 
-Settings are managed via environment variables with the prefix `CITRASCOPE_`. You must configure your personal access token and telescope ID, as well as INDI server details. You can set these variables in your shell or in a `.env` file at the project root.
+```sh
+citrascope --help
+```
 
-Example `.env` file:
+## Usage
 
-```env
-CITRASCOPE_PERSONAL_ACCESS_TOKEN=citra_pat_xxx
-CITRASCOPE_TELESCOPE_ID=xxx
-# CITRASCOPE_INDI_SERVER_URL=127.0.0.1
-CITRASCOPE_INDI_SERVER_URL=host.docker.internal  # use with devcontainer for accessing a localhost indi server
-CITRASCOPE_INDI_SERVER_PORT=7624
-CITRASCOPE_INDI_TELESCOPE_NAME=Telescope Simulator
-```
+### Starting the Daemon
 
-**Variable descriptions:**
+Run the daemon with:
 
-- `CITRASCOPE_PERSONAL_ACCESS_TOKEN`: Your CitraScope personal access token (required)
-- `CITRASCOPE_TELESCOPE_ID`: Your telescope ID (required)
-- `CITRASCOPE_INDI_SERVER_URL`: Hostname or IP address of the INDI server (default: `host.docker.internal` for devcontainers, or `127.0.0.1` for local)
-- `CITRASCOPE_INDI_SERVER_PORT`: Port for the INDI server (default: `7624`)
-- `CITRASCOPE_INDI_TELESCOPE_NAME`: Name of the INDI telescope device (default: `Telescope Simulator`)
+```sh
+citrascope
+```
 
-You can copy `.env.example` to `.env` and tweak your values.
+By default, this starts the web interface on `http://localhost:24872`. You can customize the port:
+
+```sh
+citrascope --web-port 8080
+```
 
 ## Developer Setup
 
@@ -112,6 +129,16 @@ By opening this project in VS Code and choosing "Reopen in Container" (or using
 
 The devcontainer also ensures all required system dependencies (like `cmake`) are installed automatically.
 
+### Python Version
+
+This project requires Python 3.10 or higher, up to Python 3.12. A `.python-version` file is included specifying Python 3.12 as the recommended version. If you use [pyenv](https://github.com/pyenv/pyenv), it will automatically use this version when you enter the project directory.
+
+### If not using the dev container:
+```sh
+python -m venv .venv
+source .venv/bin/activate
+```
+
 ### Installing Development Dependencies
 
 To install development dependencies (for code style, linting, and pre-commit hooks):
@@ -138,20 +165,33 @@ pre-commit run --all-files
 
 This ensures code style and quality checks are enforced for all contributors.
 
+### Releasing a New Version
+
+To bump the version and create a release:
+
+```sh
+bump-my-version bump patch  # 0.1.3 → 0.1.4
+bump-my-version bump minor  # 0.1.3 → 0.2.0
+bump-my-version bump major  # 0.1.3 → 1.0.0
+git push && git push --tags
+```
+
+Then create a release in the GitHub UI from the new tag. This triggers automatic PyPI publishing.
+
 ### Running and Debugging with VS Code
 
 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
 
 This project uses [pytest](https://pytest.org/) for unit testing. All tests are located in the `tests/` directory.
 
-To run tests manually:
+To run unit tests within your devcontainer:
 
 ```bash
 pytest

citrascope-0.4.0/README.md

@@ -0,0 +1,149 @@
+# CitraScope
+[![Pytest](https://github.com/citra-space/citrascope/actions/workflows/pytest.yml/badge.svg)](https://github.com/citra-space/citrascope/actions/workflows/pytest.yml) [![Publish Python Package](https://github.com/citra-space/citrascope/actions/workflows/pypi-publish.yml/badge.svg)](https://github.com/citra-space/citrascope/actions/workflows/pypi-publish.yml)
+
+Remotely control a telescope while it polls for tasks, collects observations, and delivers data for further processing.
+
+## Features
+- Offers a web UI to configure hardware and connect to Citra.space's api
+- Connects to Citra.space's API and identifies itself as an online telescope
+- 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
+
+**Important:** CitraScope requires Python 3.10, 3.11, or 3.12.
+
+### Check Your Python Version
+
+```sh
+python3 --version
+```
+
+If you don't have a compatible version, install one with [pyenv](https://github.com/pyenv/pyenv):
+
+```sh
+pyenv install 3.12.0
+pyenv local 3.12.0  # Sets Python 3.12.0 for the current directory
+```
+
+### Install CitraScope
+
+**Recommended: Using pip in a virtual environment**
+
+```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:
+
+```sh
+citrascope --help
+```
+
+## Usage
+
+### Starting the Daemon
+
+Run the daemon with:
+
+```sh
+citrascope
+```
+
+By default, this starts the web interface on `http://localhost:24872`. You can customize the port:
+
+```sh
+citrascope --web-port 8080
+```
+
+## Developer Setup
+
+If you are developing on macOS or Windows, use the provided [VS Code Dev Container](https://code.visualstudio.com/docs/devcontainers/containers) setup. The devcontainer provides a full Linux environment, which is required for the `pyindi-client` dependency to work. This is necessary because `pyindi-client` only works on Linux, and will not function natively on Mac or Windows.
+
+By opening this project in VS Code and choosing "Reopen in Container" (or using the Dev Containers extension), you can develop and run the project seamlessly, regardless of your host OS.
+
+The devcontainer also ensures all required system dependencies (like `cmake`) are installed automatically.
+
+### Python Version
+
+This project requires Python 3.10 or higher, up to Python 3.12. A `.python-version` file is included specifying Python 3.12 as the recommended version. If you use [pyenv](https://github.com/pyenv/pyenv), it will automatically use this version when you enter the project directory.
+
+### If not using the dev container:
+```sh
+python -m venv .venv
+source .venv/bin/activate
+```
+
+### Installing Development Dependencies
+
+To install development dependencies (for code style, linting, and pre-commit hooks):
+
+```sh
+pip install '.[dev]'
+```
+
+### Setting up Pre-commit Hooks
+
+This project uses [pre-commit](https://pre-commit.com/) to run code quality checks (like Flake8, Black, isort, etc.) automatically before each commit.
+
+After installing the dev dependencies, enable the hooks with:
+
+```sh
+pre-commit install
+```
+
+You can manually run all pre-commit checks on all files with:
+
+```sh
+pre-commit run --all-files
+```
+
+This ensures code style and quality checks are enforced for all contributors.
+
+### Releasing a New Version
+
+To bump the version and create a release:
+
+```sh
+bump-my-version bump patch  # 0.1.3 → 0.1.4
+bump-my-version bump minor  # 0.1.3 → 0.2.0
+bump-my-version bump major  # 0.1.3 → 1.0.0
+git push && git push --tags
+```
+
+Then create a release in the GitHub UI from the new tag. This triggers automatic PyPI publishing.
+
+### Running and Debugging with VS Code
+
+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** — 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.
+
+## Running Tests
+
+This project uses [pytest](https://pytest.org/) for unit testing. All tests are located in the `tests/` directory.
+
+To run unit tests within your devcontainer:
+
+```bash
+pytest
+```

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.1.0 → citrascope-0.4.0}/citrascope/api/abstract_api_client.py

@@ -21,3 +21,10 @@ class AbstractCitraApiClient(ABC):
     @abstractmethod
     def get_ground_station(self, ground_station_id):
         pass
+
+    @abstractmethod
+    def put_telescope_status(self, body):
+        """
+        PUT to /telescopes to report online status.
+        """
+        pass

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

@@ -6,6 +6,20 @@ from .abstract_api_client import AbstractCitraApiClient
 
 
 class CitraApiClient(AbstractCitraApiClient):
+    def put_telescope_status(self, body):
+        """
+        PUT to /telescopes to report online status.
+        """
+        try:
+            response = self._request("PUT", "/telescopes", json=body)
+            if self.logger:
+                self.logger.debug(f"PUT /telescopes: {response}")
+            return response
+        except Exception as e:
+            if self.logger:
+                self.logger.error(f"Failed PUT /telescopes: {e}")
+            return None
+
     def __init__(self, host: str, token: str, use_ssl: bool = True, logger=None):
         self.base_url = ("https" if use_ssl else "http") + "://" + host
         self.token = token
@@ -27,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:
@@ -57,8 +83,10 @@ class CitraApiClient(AbstractCitraApiClient):
 
     def upload_image(self, task_id, telescope_id, filepath):
         """Upload an image file for a given task."""
+        file_size = os.path.getsize(filepath)
         signed_url_response = self._request(
-            "POST", f"/my/images?filename=citra_task_{task_id}_image.fits&telescope_id={telescope_id}&task_id={task_id}"
+            "POST",
+            f"/my/images?filename=citra_task_{task_id}_image.fits&telescope_id={telescope_id}&task_id={task_id}&file_size={file_size}",
         )
         if not signed_url_response or "uploadUrl" not in signed_url_response:
             if self.logger:
@@ -99,3 +127,16 @@ class CitraApiClient(AbstractCitraApiClient):
             if self.logger:
                 self.logger.error(f"Failed to mark task {task_id} as complete: {e}")
             return None
+
+    def mark_task_failed(self, task_id):
+        """Mark a task as failed using the API."""
+        try:
+            body = {"status": "Failed"}
+            response = self._request("PUT", f"/tasks/{task_id}", json=body)
+            if self.logger:
+                self.logger.debug(f"Marked task {task_id} as failed: {response}")
+            return response
+        except Exception as e:
+            if self.logger:
+                self.logger.error(f"Failed to mark task {task_id} as failed: {e}")
+            return None