WIP

misc/BreCalApi.md

@@ -0,0 +1,537 @@
+# Bremen calling API
+Version: _1.7.0_
+Last change: _Nov 14, 2025_
+
+## Introduction
+
+This API allows users to interact with "Bremen calling" without an UI. Apart vom querying data via _GET_ endpoints users may create and update shipcalls, assign participants and update participant times for shipcalls. 
+
+Creating and updating times and shipcalls depend on the participant roles a user is assigned to. For example, if a participant has the role "AGENCY" they may change assignments _and_ create and update agency times. A participant with the role "PILOT" on the other hand may not change the assigments and only create/update times for the pilot.
+
+### Authentication
+- **ApiKey**: API key in `header` header named `Authorization`. This is a JWT Token that the caller receives upon login.
+
+### Notes on this version
+
+This version refers to _1.7_ whereas the public client currently has version _1.6_. This means that there is some functionality available in the API that cannot be accessed through the UI yet, specifically notifications.
+
+There is no documentation for the structures returned by _GET_ requests but these can easily be determined via a single query.
+
+## Ship Endpoints
+
+### `DELETE /ships`
+**Summary:** Delete a ship (logically).
+A ship can only be logically deleted, since it is possible to have been used in previous shipcalls. On logical delete, the ship can no longer be selected in a new ship call.
+
+#### Parameters
+
+| Name | In | Type | Required | Description |
+|------|----|------|----------|-------------|
+| id | query | integer | Yes | **Id of ship**. *Example: 42*. Id of ship to be deleted. |
+
+#### Responses
+
+- **200**
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `GET /ships`
+**Summary:** gets a list of ships
+Gets a list of ships including logically deleted ships to be used with shipcalls
+
+#### Responses
+
+- **200**: list of ships
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `POST /ships`
+**Summary:** create a new ship entry
+adds a new non-existing ship to the database. The ships IMO number is the unique identifier.
+
+#### Request Body
+Ship details. **Do not** provide id parameter.
+
+**JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| id | integer | No |  |
+| name | string | No |  |
+| imo | integer | No |  |
+| callsign | string | No |  |
+| participant_id | integer | No | Optional reference to participant (tug role) |
+| length | number | No |  |
+| width | number | No |  |
+| is_tug | boolean | No |  |
+| bollard_pull | integer | No |  |
+| eni | integer | No | BSMD internal use |
+| created | string | No | Readonly field set by the database when ship was created |
+| modified | string | No | Readonly field set by the database when ship was last modified |
+| deleted | boolean | No | marks the ship as logically deleted |
+
+#### Responses
+
+- **201**
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `PUT /ships`
+**Summary:** Update a ship entry
+Updating a ship entry. Please do not modify the IMO number. In that case please add a new entry.
+
+#### Request Body
+Updated ship entry. The id parameter is **required**.
+
+**JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| id | integer | No |  |
+| name | string | No |  |
+| imo | integer | No |  |
+| callsign | string | No |  |
+| participant_id | integer | No | Optional reference to participant (tug role) |
+| length | number | No |  |
+| width | number | No |  |
+| is_tug | boolean | No |  |
+| bollard_pull | integer | No |  |
+| eni | integer | No | BSMD internal use |
+| created | string | No | Readonly field set by the database when ship was created |
+| modified | string | No | Readonly field set by the database when ship was last modified |
+| deleted | boolean | No | marks the ship as logically deleted |
+
+#### Responses
+
+- **200**
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+## Shipcall Endpoints
+
+### `GET /shipcalls`
+**Summary:** Gets a list of ship calls
+Get current ship calls
+
+#### Parameters
+
+| Name | In | Type | Required | Description |
+|------|----|------|----------|-------------|
+| past_days | query | integer | No | number of days in the past to include in the result. *Example: 7*. |
+
+#### Responses
+
+- **200**: ship call list
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `POST /shipcalls`
+**Summary:** Create a new ship call
+A new shipcall is created without times at this point. This is ususally done by the BSMD or a participant with that particular role.
+
+#### Request Body
+Creates a new ship call. **Do not** provide id parameter.
+
+**JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| id | integer | No |  |
+| ship_id | integer | Yes |  |
+| port_id | integer | No |  |
+| type | string | Yes | Type of ship call |
+| eta | string | No |  |
+| voyage | string | No |  |
+| etd | string | No |  |
+| arrival_berth_id | integer | No |  |
+| departure_berth_id | integer | No |  |
+| tug_required | boolean | No |  |
+| pilot_required | boolean | No |  |
+| flags | integer | No |  |
+| pier_side | boolean | No |  |
+| bunkering | boolean | No |  |
+| replenishing_terminal | boolean | No |  |
+| replenishing_lock | boolean | No |  |
+| draft | number | No |  |
+| tidal_window_from | string | No |  |
+| tidal_window_to | string | No |  |
+| rain_sensitive_cargo | boolean | No |  |
+| recommended_tugs | integer | No |  |
+| anchored | boolean | No |  |
+| moored_lock | boolean | No |  |
+| canceled | boolean | No |  |
+| evaluation | string | No | Evaluation of the ship call |
+| evaluation_message | string | No |  |
+| time_ref_point | integer | No | Physical reference point for all times given in shipcall and depending times entries |
+| participants | array<object> | No |  |
+| created | string | No | Readonly field set by the database when shipcall was created |
+| modified | string | No | Readonly field set by the database when shipcall was last modified |
+
+#### Responses
+
+- **201**
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `PUT /shipcalls`
+**Summary:** Updates a ship call
+Updates a shipcall. Usually done if the participant assignments change.
+
+#### Request Body
+Creates a new ship call. The id parameter is **required**.
+
+**JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| id | integer | No |  |
+| ship_id | integer | Yes |  |
+| port_id | integer | No |  |
+| type | string | Yes | Type of ship call |
+| eta | string | No |  |
+| voyage | string | No |  |
+| etd | string | No |  |
+| arrival_berth_id | integer | No |  |
+| departure_berth_id | integer | No |  |
+| tug_required | boolean | No |  |
+| pilot_required | boolean | No |  |
+| flags | integer | No |  |
+| pier_side | boolean | No |  |
+| bunkering | boolean | No |  |
+| replenishing_terminal | boolean | No |  |
+| replenishing_lock | boolean | No |  |
+| draft | number | No |  |
+| tidal_window_from | string | No |  |
+| tidal_window_to | string | No |  |
+| rain_sensitive_cargo | boolean | No |  |
+| recommended_tugs | integer | No |  |
+| anchored | boolean | No |  |
+| moored_lock | boolean | No |  |
+| canceled | boolean | No |  |
+| evaluation | string | No | Evaluation of the ship call |
+| evaluation_message | string | No |  |
+| time_ref_point | integer | No | Physical reference point for all times given in shipcall and depending times entries |
+| participants | array<object> | No |  |
+| created | string | No | Readonly field set by the database when shipcall was created |
+| modified | string | No | Readonly field set by the database when shipcall was last modified |
+
+#### Responses
+
+- **200**
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+## Static Endpoints
+
+### `GET /berths`
+**Summary:** Gets a list of all berths registered
+Returns a list of berths, including berths that are (logically) deleted
+
+#### Responses
+
+- **200**: list of berths
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `GET /history`
+**Summary:** History data
+This endpoint returns a list of changes made to the specific shipcall
+
+#### Parameters
+
+| Name | In | Type | Required | Description |
+|------|----|------|----------|-------------|
+| shipcall_id | query | integer | Yes | **Id of ship call**. *Example: 3*. Id given in ship call list |
+
+#### Responses
+
+- **200**: list of history entries
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `GET /notifications`
+**Summary:** Gets a list of notifications pursuant to a specified participant and ship call
+List of notifications (tbd)
+
+#### Parameters
+
+| Name | In | Type | Required | Description |
+|------|----|------|----------|-------------|
+| shipcall_id | query | integer | No | **Id of ship call**. *Example: 52*. Id given in ship call list |
+
+#### Responses
+
+- **200**: notification list
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `GET /participants`
+**Summary:** gets one or all participants
+If no parameter is given, all participants are returned. The list can be used to display participant information in the context of ship calls.
+
+#### Parameters
+
+| Name | In | Type | Required | Description |
+|------|----|------|----------|-------------|
+| user_id | query | integer | No | **Id of user**. *Example: 2*. User id returned by verify call. |
+
+#### Responses
+
+- **200**: one or all participants as list
+- **400**
+- **401**
+- **404**
+- **500**
+- **503**
+---
+
+### `GET /ports`
+**Summary:** Your GET endpoint
+Returns a list of ports
+
+#### Responses
+
+- **200**: list of ports
+- **401**
+- **403**
+- **500**
+- **503**
+---
+
+## Times Endpoints
+
+### `DELETE /times`
+**Summary:** Delete a times entry for a ship call.
+A times entry is typically deleted if the agent for example changes or removes the participant assignment for a particular role.
+
+#### Parameters
+
+| Name | In | Type | Required | Description |
+|------|----|------|----------|-------------|
+| id | query | integer | Yes | **Id of times**. *Example: 42*. Id of times entry to be deleted. |
+
+#### Responses
+
+- **200**
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `GET /times`
+**Summary:** Gets list of times
+Get all times assigned to a shipcall. These might not be complete.
+
+#### Parameters
+
+| Name | In | Type | Required | Description |
+|------|----|------|----------|-------------|
+| shipcall_id | query | integer | No | **Id**. *Example: 42*. Id of referenced ship call. |
+
+#### Responses
+
+- **200**: list of recorded times
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `POST /times`
+**Summary:** Create a new times entry for a ship call
+The times entry for a shipcall is created with reference to a participant. For each participant type there should be only one times data record.
+
+#### Request Body
+Times entry that will be added to the ship call. **Do not** provide id parameter.
+
+**JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| id | integer | No |  |
+| eta_berth | string | No | Arrival time at berth |
+| eta_berth_fixed | boolean | No | If true, the eta is fixed and cannot be changed |
+| etd_berth | string | No | departure time from berth |
+| etd_berth_fixed | boolean | No | If true, the etd is fixed and cannot be changed |
+| lock_time | string | No | arrival time at lock |
+| lock_time_fixed | boolean | No | If true, the lock time is fixed and cannot be changed |
+| zone_entry | string | No | Expected time of entry into the zone |
+| zone_entry_fixed | boolean | No | If true, the zone entry time is fixed and cannot be changed |
+| operations_start | string | No | Start time for terminal operations |
+| operations_end | string | No | End time for terminal operations |
+| remarks | string | No | Additional remarks |
+| shipcall_id | integer | Yes | Reference to a shipcall id |
+| participant_id | integer | Yes | Reference to a participant id |
+| berth_id | integer | No | Reference to a berth id |
+| berth_info | string | No | Additional info text for berth |
+| pier_side | boolean | No | true if ship is rotated, false otherwise |
+| participant_type | integer | No |  |
+| ata | string | No | ata can be set by mooring if actual times are different from planned |
+| atd | string | No | atd can be set by mooring if actual times are different from planned |
+| eta_interval_end | string | No | Optional end of the interval for the times eta entry |
+| etd_interval_end | string | No | Optional end of the interval for the times etd entry |
+| created | string | No | Readonly field set by the database when times record was created |
+| modified | string | No | Readonly field set by the database when times record was last modified |
+
+#### Responses
+
+- **201**
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+### `PUT /times`
+**Summary:** Update a times entry for a ship call
+Updating a times entry for a ship for a particular participant. The times entries are required for a shipcall to pass the validation rules.
+
+#### Request Body
+Times entry that will be added to the ship call. The id parameter is **required**.
+
+**JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| id | integer | No |  |
+| eta_berth | string | No | Arrival time at berth |
+| eta_berth_fixed | boolean | No | If true, the eta is fixed and cannot be changed |
+| etd_berth | string | No | departure time from berth |
+| etd_berth_fixed | boolean | No | If true, the etd is fixed and cannot be changed |
+| lock_time | string | No | arrival time at lock |
+| lock_time_fixed | boolean | No | If true, the lock time is fixed and cannot be changed |
+| zone_entry | string | No | Expected time of entry into the zone |
+| zone_entry_fixed | boolean | No | If true, the zone entry time is fixed and cannot be changed |
+| operations_start | string | No | Start time for terminal operations |
+| operations_end | string | No | End time for terminal operations |
+| remarks | string | No | Additional remarks |
+| shipcall_id | integer | Yes | Reference to a shipcall id |
+| participant_id | integer | Yes | Reference to a participant id |
+| berth_id | integer | No | Reference to a berth id |
+| berth_info | string | No | Additional info text for berth |
+| pier_side | boolean | No | true if ship is rotated, false otherwise |
+| participant_type | integer | No |  |
+| ata | string | No | ata can be set by mooring if actual times are different from planned |
+| atd | string | No | atd can be set by mooring if actual times are different from planned |
+| eta_interval_end | string | No | Optional end of the interval for the times eta entry |
+| etd_interval_end | string | No | Optional end of the interval for the times etd entry |
+| created | string | No | Readonly field set by the database when times record was created |
+| modified | string | No | Readonly field set by the database when times record was last modified |
+
+#### Responses
+
+- **200**
+- **400**
+- **401**
+- **500**
+- **503**
+---
+
+## User Endpoints
+
+### `POST /login`
+**Summary:** Returns a JWT session token and user data if successful
+Perform login
+
+#### Request Body
+Login credentials
+
+**JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| username | string | Yes |  |
+| password | string | Yes |  |
+
+#### Responses
+
+- **200**: Successful response
+- **400**
+- **403**
+- **500**
+- **503**
+
+**Response 200 JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| id | integer | No |  |
+| participant_id | integer | No |  |
+| first_name | string | No |  |
+| last_name | string | No |  |
+| user_name | string | No |  |
+| user_phone | string | No |  |
+| user_email | string | No |  |
+| notify_email | boolean | No |  |
+| notify_whatsapp | boolean | No |  |
+| notify_signal | boolean | No |  |
+| notify_popup | boolean | No |  |
+| exp | number | No |  |
+| token | string | No |  |
+| notify_on | array<string> | No |  |
+
+---
+
+### `PUT /user`
+**Summary:** Update user details (first/last name, phone, password)
+Update user information
+
+#### Request Body
+User details
+
+**JSON Schema**
+
+| Field | Type | Required | Description |
+|-------|------|----------|-------------|
+| id | integer | No |  |
+| old_password | string | No |  |
+| new_password | string | No |  |
+| first_name | string | No |  |
+| last_name | string | No |  |
+| user_phone | string | No |  |
+| user_email | string | No |  |
+| notify_email | boolean | No |  |
+| notify_popup | boolean | No |  |
+| notify_whatsapp | boolean | No |  |
+| notify_signal | boolean | No |  |
+| notify_on | array<string> | No |  |
+
+#### Responses
+
+- **200**
+- **400**
+- **401**
+- **500**
+- **503**
+---

misc/BreCalApi.yaml

@@ -22,6 +22,8 @@ tags:
   - name: times
   - name: static
   - name: ship
+  - name: notification
+  - name: history
 paths:
   /login:
     post:
@@ -30,6 +32,7 @@ paths:
       tags:
         - user
       operationId: login
+      security: []
       requestBody:
         description: Login credentials
         required: true
@@ -256,7 +259,7 @@ paths:
         - shipcall
       operationId: shipcallUpdate
       requestBody:
-        description: Creates a new ship call. The id parameter is **required**.
+        description: Updates a ship call. The id parameter is **required**.
         required: true
         content:
           application/json:
@@ -443,7 +446,7 @@ paths:
         - name: user_id
           in: query
           required: false
-          description: '**Id of user**. *Example: 2*. User id returned by verify call.'
+          description: '**Id of user**. *Example: 2*. User id returned by login call.'
           schema:
             type: integer
             example: 2
@@ -581,7 +584,7 @@ paths:
         - times
       operationId: timesUpdate
       requestBody:
-        description: Times entry that will be added to the ship call. The id parameter is **required**.
+        description: Times entry that will be updated for the ship call. The id parameter is **required**.
         required: true
         content:
           application/json:
@@ -649,10 +652,10 @@ paths:
           $ref: '#/components/responses/503'
   /notifications:
     get:
-      summary: Gets a list of notifications pursuant to a specified participant and ship call
+      summary: Gets a list of notifications pursuant to a specified ship call
       description: List of notifications (tbd)
       tags:
-        - static
+        - notification
       operationId: notificationsGet
       parameters:
         - name: shipcall_id
@@ -723,7 +726,7 @@ paths:
       description: This endpoint returns a list of changes made to the specific shipcall
       summary: History data
       tags:
-        - static
+        - history
       operationId: historyGet
       parameters:
         - name: shipcall_id
@@ -1756,10 +1759,11 @@ components:
         token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c
     user_details:
       type: object
-      description: fields that a user may change
+      description: user metadata and editable fields
       properties:
         id:
           type: integer
+          readOnly: true
           example: 42
         old_password:
           type: string

src/brecal_api_client/README.md

@@ -0,0 +1,51 @@
+# BreCal API Client
+
+Minimal Python helper for `misc/BreCalApi.yaml`. It focuses on the login, shipcall, and times endpoints needed by CLI tools, but the helper method `BreCalClient.raw_request` makes it straightforward to call any other endpoint defined in the OpenAPI specification.
+
+Dependencies: only the `requests` package in addition to the standard library.
+
+## Endpoint selection
+
+`BreCalClient` reads its default `base_url` from `~/.config/brecal/client.json`. The file lets you define multiple deployments and switch between them without modifying code:
+
+```json
+{
+  "environment": "devel",
+  "endpoints": {
+    "local": "http://localhost:5000",
+    "devel": "https://brecaldevel.bsmd-emswe.eu",
+    "test": "https://brecaltest.example.net",
+    "prod": "https://brecal.example.com"
+  }
+}
+```
+
+Override the selection at runtime via `BreCalClient(base_url="...")` or the environment variable `BRECAL_BASE_URL`. If no config is present the client falls back to the development server URL.
+
+## Credentials
+
+Store credentials in `~/.config/brecal/credentials.json`:
+
+```json
+{
+  "username": "alfred",
+  "password": "123456"
+}
+```
+
+You can override the location when calling `Credentials.load("/path/to/file.json")` or provide credentials from environment variables via `Credentials.from_env()`.
+
+## Example
+
+```python
+from brecal_api_client import BreCalClient, Credentials
+
+creds = Credentials.load()
+with BreCalClient(credentials=creds) as client:
+    # list ship calls from the last week
+    shipcalls = client.get_shipcalls(past_days=7)
+
+    # create/update ship calls or times
+    shipcall_id = client.create_shipcall({...})
+    times = client.get_times(shipcall_id=shipcall_id)
+```

src/brecal_api_client/__init__.py

@@ -0,0 +1,25 @@
+"""Simple Python client for the BreCal REST API."""
+
+from .client import BreCalClient, DEFAULT_BASE_URL
+from .config import ClientConfig, get_default_base_url
+from .credentials import Credentials
+from .exceptions import (
+    AuthenticationError,
+    AuthorizationError,
+    BreCalApiError,
+    ClientConfigurationError,
+)
+from .types import LoginResult
+
+__all__ = [
+    "BreCalClient",
+    "Credentials",
+    "ClientConfig",
+    "get_default_base_url",
+    "LoginResult",
+    "DEFAULT_BASE_URL",
+    "BreCalApiError",
+    "AuthenticationError",
+    "AuthorizationError",
+    "ClientConfigurationError",
+]

src/brecal_api_client/client.py

@@ -0,0 +1,248 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any, Dict, Iterable, Mapping, Optional, Sequence
+from urllib.parse import urljoin
+
+import requests
+import time
+
+from .config import get_default_base_url
+from .credentials import Credentials
+from .exceptions import (
+    AuthenticationError,
+    AuthorizationError,
+    BreCalApiError,
+    ClientConfigurationError,
+)
+from .types import JsonDict, LoginResult, MutableJsonDict
+
+DEFAULT_BASE_URL = get_default_base_url()
+
+
+@dataclass
+class _RequestContext:
+    method: str
+    path: str
+    expected: Sequence[int]
+    auth: bool
+
+
+class BreCalClient:
+    """Thin convenience wrapper around the BreCal REST API."""
+
+    def __init__(
+        self,
+        base_url: Optional[str] = None,
+        *,
+        credentials: Optional[Credentials] = None,
+        timeout: float = 30.0,
+        session: Optional[requests.Session] = None,
+        auto_login: bool = True,
+    ) -> None:
+        resolved_base_url = base_url or get_default_base_url()
+        if not resolved_base_url:
+            raise ClientConfigurationError("base_url must be provided.")
+        self.base_url = resolved_base_url.rstrip("/")
+        self._timeout = timeout
+        self._session = session or requests.Session()
+        self._credentials = credentials
+        self._login: Optional[LoginResult] = None
+        if auto_login and credentials is not None:
+            self.login(credentials)
+
+    # -----------------------------------------------------
+    # lifecycle helpers
+    # -----------------------------------------------------
+    def close(self) -> None:
+        self._session.close()
+
+    def __enter__(self) -> "BreCalClient":
+        return self
+
+    def __exit__(self, exc_type, exc, tb) -> None:
+        self.close()
+
+    # -----------------------------------------------------
+    # authentication
+    # -----------------------------------------------------
+    @property
+    def token(self) -> Optional[str]:
+        return self._login.token if self._login else None
+
+    @property
+    def login_info(self) -> Optional[LoginResult]:
+        return self._login
+
+    def ensure_authenticated(self) -> None:
+        if self._login and self._login.expires_at.timestamp() > _epoch_seconds() + 30:
+            return
+        if not self._credentials:
+            raise AuthenticationError(
+                "Client has no stored credentials. Call login() with credentials first."
+            )
+        self.login(self._credentials)
+
+    def login(self, credentials: Credentials) -> LoginResult:
+        payload = {"username": credentials.username, "password": credentials.password}
+        data = self._request_json(
+            _RequestContext("POST", "/login", expected=(200,), auth=False),
+            json=payload,
+        )
+        if not isinstance(data, Mapping):
+            raise AuthenticationError("Login returned unexpected payload.")
+        result = LoginResult.from_api(data)
+        if not result.token:
+            raise AuthenticationError("Login response did not include a token.")
+        self._login = result
+        self._credentials = credentials
+        return result
+
+    # -----------------------------------------------------
+    # shipcalls
+    # -----------------------------------------------------
+    def get_shipcalls(self, *, past_days: Optional[int] = None) -> Sequence[JsonDict]:
+        params: Dict[str, Any] = {}
+        if past_days is not None:
+            params["past_days"] = int(past_days)
+        data = self._request_json(
+            _RequestContext("GET", "/shipcalls", expected=(200,), auth=True),
+            params=params or None,
+        )
+        return _as_sequence_of_dicts(data)
+
+    def create_shipcall(self, shipcall: Mapping[str, Any]) -> int:
+        payload = _copy_without_keys(shipcall, drop_keys=("id",))
+        data = self._request_json(
+            _RequestContext("POST", "/shipcalls", expected=(201,), auth=True),
+            json=payload,
+        )
+        return _extract_id(data)
+
+    def update_shipcall(self, shipcall: Mapping[str, Any]) -> int:
+        if "id" not in shipcall:
+            raise ValueError("Shipcall update requires an 'id' field.")
+        data = self._request_json(
+            _RequestContext("PUT", "/shipcalls", expected=(200,), auth=True),
+            json=dict(shipcall),
+        )
+        return _extract_id(data)
+
+    # -----------------------------------------------------
+    # times
+    # -----------------------------------------------------
+    def get_times(self, *, shipcall_id: Optional[int] = None) -> Sequence[JsonDict]:
+        params = {"shipcall_id": int(shipcall_id)} if shipcall_id is not None else None
+        data = self._request_json(
+            _RequestContext("GET", "/times", expected=(200,), auth=True),
+            params=params,
+        )
+        return _as_sequence_of_dicts(data)
+
+    def create_times(self, entry: Mapping[str, Any]) -> int:
+        payload = _copy_without_keys(entry, drop_keys=("id",))
+        data = self._request_json(
+            _RequestContext("POST", "/times", expected=(201,), auth=True),
+            json=payload,
+        )
+        return _extract_id(data)
+
+    def update_times(self, entry: Mapping[str, Any]) -> int:
+        if "id" not in entry:
+            raise ValueError("Times update requires an 'id' field.")
+        data = self._request_json(
+            _RequestContext("PUT", "/times", expected=(200,), auth=True),
+            json=dict(entry),
+        )
+        return _extract_id(data)
+
+    def delete_times(self, times_id: int) -> int:
+        data = self._request_json(
+            _RequestContext("DELETE", "/times", expected=(200,), auth=True),
+            params={"id": int(times_id)},
+        )
+        return _extract_id(data)
+
+    # -----------------------------------------------------
+    # generic helpers
+    # -----------------------------------------------------
+    def raw_request(
+        self,
+        method: str,
+        path: str,
+        *,
+        expected: Sequence[int] = (200,),
+        auth: bool = True,
+        **kwargs: Any,
+    ) -> Any:
+        """Expose the low-level request helper for endpoints not wrapped yet."""
+        ctx = _RequestContext(method.upper(), path, expected, auth)
+        return self._request_json(ctx, **kwargs)
+
+    def _request_json(self, ctx: _RequestContext, **kwargs: Any) -> Any:
+        url = urljoin(f"{self.base_url}/", ctx.path.lstrip("/"))
+        headers: Dict[str, str] = kwargs.pop("headers", {})
+        headers.setdefault("Accept", "application/json")
+        if "json" in kwargs:
+            headers.setdefault("Content-Type", "application/json")
+        if ctx.auth:
+            self.ensure_authenticated()
+            headers.setdefault("Authorization", f"Bearer {self.token}")
+
+        response = self._session.request(
+            ctx.method,
+            url,
+            timeout=self._timeout,
+            headers=headers,
+            **kwargs,
+        )
+        if response.status_code == 401 or response.status_code == 403:
+            raise AuthorizationError(
+                f"{ctx.method} {ctx.path} returned {response.status_code}",
+                status_code=response.status_code,
+                payload=_safe_json(response),
+            )
+        if response.status_code not in ctx.expected:
+            raise BreCalApiError(
+                f"{ctx.method} {ctx.path} returned {response.status_code}",
+                status_code=response.status_code,
+                payload=_safe_json(response),
+            )
+        if response.content:
+            return _safe_json(response)
+        return None
+
+
+def _copy_without_keys(
+    data: Mapping[str, Any], *, drop_keys: Iterable[str]
+) -> MutableJsonDict:
+    payload: MutableJsonDict = dict(data)
+    for key in drop_keys:
+        payload.pop(key, None)
+    return payload
+
+
+def _extract_id(payload: Any) -> int:
+    if isinstance(payload, Mapping) and "id" in payload:
+        return int(payload["id"])
+    raise BreCalApiError("API response did not include an 'id' field.", payload=payload)
+
+
+def _as_sequence_of_dicts(data: Any) -> Sequence[JsonDict]:
+    if isinstance(data, list):
+        return data
+    raise BreCalApiError("Expected list response from API.", payload=data)
+
+
+def _safe_json(response: requests.Response) -> Any:
+    content_type = response.headers.get("Content-Type", "")
+    if "application/json" in content_type:
+        try:
+            return response.json()
+        except ValueError:
+            pass
+    return response.text
+
+
+def _epoch_seconds() -> int:
+    return int(time.time())

src/brecal_api_client/config.py

@@ -0,0 +1,74 @@
+from __future__ import annotations
+
+import json
+import os
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any, Mapping, Optional, Union
+
+from .exceptions import ClientConfigurationError
+
+ConfigPath = Union[str, Path]
+
+DEFAULT_BASE_URL_FALLBACK = "https://brecaldevel.bsmd-emswe.eu"
+CONFIG_FILENAME = "client.json"
+
+
+def _default_config_path() -> Path:
+    xdg = Path(os.environ.get("XDG_CONFIG_HOME", Path.home() / ".config"))
+    return (xdg / "brecal" / CONFIG_FILENAME).expanduser()
+
+
+@dataclass(frozen=True)
+class ClientConfig:
+    base_url: str
+    environment: Optional[str] = None
+
+    @classmethod
+    def from_mapping(cls, data: Mapping[str, Any]) -> "ClientConfig":
+        environment = data.get("environment")
+        base_url = data.get("base_url")
+        endpoints = data.get("endpoints")
+
+        if isinstance(endpoints, Mapping):
+            if environment and environment in endpoints:
+                base_url = endpoints[environment]
+            elif not base_url and endpoints:
+                # Pick the first entry as a last resort
+                _, base_url = next(iter(endpoints.items()))
+
+        if not base_url:
+            raise ClientConfigurationError(
+                "Client configuration requires either 'base_url' or an "
+                "'endpoints' mapping."
+            )
+
+        return cls(
+            base_url=str(base_url).rstrip("/"),
+            environment=str(environment) if environment else None,
+        )
+
+    @classmethod
+    def load(cls, path: Optional[ConfigPath] = None) -> "ClientConfig":
+        file_path = Path(path) if path else _default_config_path()
+        data = json.loads(file_path.read_text(encoding="utf-8"))
+        return cls.from_mapping(data)
+
+
+def get_default_base_url(path: Optional[ConfigPath] = None) -> str:
+    """Resolve the default base URL using env vars or ~/.config/brecal/client.json."""
+    env_override = os.getenv("BRECAL_BASE_URL")
+    if env_override:
+        return env_override.rstrip("/")
+
+    try:
+        config = ClientConfig.load(path=path)
+        return config.base_url
+    except FileNotFoundError:
+        return DEFAULT_BASE_URL_FALLBACK
+    except ClientConfigurationError:
+        raise
+    except Exception as exc:
+        raise ClientConfigurationError(
+            f"Failed to load BreCal client configuration: {exc}"
+        ) from exc

src/brecal_api_client/credentials.py

@@ -0,0 +1,68 @@
+from __future__ import annotations
+
+import json
+import os
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any, Mapping, Optional, Union
+
+ConfigPath = Union[str, Path]
+
+
+def _default_credentials_path() -> Path:
+    """Return the default path for the credential file."""
+    xdg = Path(os.environ.get("XDG_CONFIG_HOME", Path.home() / ".config"))
+    return (xdg / "brecal" / "credentials.json").expanduser()
+
+
+@dataclass(frozen=True)
+class Credentials:
+    """Holds username/password pairs for the BreCal API."""
+
+    username: str
+    password: str
+
+    @classmethod
+    def from_mapping(cls, data: Mapping[str, Any]) -> "Credentials":
+        """Create credentials from a mapping (dict, TOML config, etc.)."""
+        username = _coalesce_key(
+            data, ("username", "user_name", "user"), required="username"
+        )
+        password = _coalesce_key(
+            data, ("password", "pass", "secret"), required="password"
+        )
+        if not isinstance(username, str) or not username.strip():
+            raise ValueError("BreCal credentials require a non-empty username.")
+        if not isinstance(password, str) or not password:
+            raise ValueError("BreCal credentials require a non-empty password.")
+        return cls(username=username.strip(), password=password)
+
+    @classmethod
+    def load(cls, path: Optional[ConfigPath] = None) -> "Credentials":
+        """Load credentials from a JSON file."""
+        file_path = Path(path) if path else _default_credentials_path()
+        text = file_path.read_text(encoding="utf-8")
+        data = json.loads(text)
+        return cls.from_mapping(data)
+
+    @classmethod
+    def from_env(
+        cls, username_var: str = "BRECAL_USERNAME", password_var: str = "BRECAL_PASSWORD"
+    ) -> "Credentials":
+        """Load credentials from environment variables."""
+        username = os.getenv(username_var)
+        password = os.getenv(password_var)
+        if not username or not password:
+            raise EnvironmentError(
+                f"Missing credentials in env vars {username_var}/{password_var}"
+            )
+        return cls(username=username, password=password)
+
+
+def _coalesce_key(
+    data: Mapping[str, Any], keys: tuple[str, ...], *, required: str
+) -> Any:
+    for key in keys:
+        if key in data:
+            return data[key]
+    raise KeyError(f"Missing '{required}' in credentials mapping.")

src/brecal_api_client/exceptions.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+from typing import Any, Optional
+
+
+class BreCalApiError(RuntimeError):
+    """Base exception for API client failures."""
+
+    def __init__(
+        self,
+        message: str,
+        *,
+        status_code: Optional[int] = None,
+        payload: Optional[Any] = None,
+    ) -> None:
+        super().__init__(message)
+        self.status_code = status_code
+        self.payload = payload
+
+
+class AuthenticationError(BreCalApiError):
+    """Raised when login fails."""
+
+
+class AuthorizationError(BreCalApiError):
+    """Raised for 401/403 responses after authentication."""
+
+
+class ClientConfigurationError(ValueError):
+    """Raised for invalid client configuration or missing dependencies."""

src/brecal_api_client/types.py

@@ -0,0 +1,58 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from datetime import datetime, timezone
+from typing import Any, Dict, Mapping, MutableMapping, Optional
+
+JsonDict = Dict[str, Any]
+MutableJsonDict = MutableMapping[str, Any]
+
+
+@dataclass
+class LoginResult:
+    """Represents the payload returned by /login."""
+
+    id: int
+    participant_id: Optional[int]
+    first_name: str
+    last_name: str
+    user_name: str
+    user_email: Optional[str]
+    user_phone: Optional[str]
+    token: str
+    exp: int
+
+    @classmethod
+    def from_api(cls, data: Mapping[str, Any]) -> "LoginResult":
+        return cls(
+            id=_coerce_int(data.get("id")),
+            participant_id=_coerce_optional_int(data.get("participant_id")),
+            first_name=str(data.get("first_name") or ""),
+            last_name=str(data.get("last_name") or ""),
+            user_name=str(data.get("user_name") or ""),
+            user_email=_coerce_optional_str(data.get("user_email")),
+            user_phone=_coerce_optional_str(data.get("user_phone")),
+            token=str(data.get("token") or ""),
+            exp=_coerce_int(data.get("exp")),
+        )
+
+    @property
+    def expires_at(self) -> datetime:
+        return datetime.fromtimestamp(self.exp, tz=timezone.utc)
+
+
+def _coerce_int(value: Any) -> int:
+    if value is None:
+        raise ValueError("Expected integer value, got None")
+    return int(value)
+
+
+def _coerce_optional_int(value: Any) -> Optional[int]:
+    return None if value is None else int(value)
+
+
+def _coerce_optional_str(value: Any) -> Optional[str]:
+    if value is None:
+        return None
+    text = str(value)
+    return text if text else None

src/server/BreCal/api/shipcalls.py

@@ -89,7 +89,7 @@ def PutShipcalls():
 
         # validate the PUT shipcall data and the user's authority
         InputValidationShipcall.evaluate_put_data(user_data, loadedModel, content)
-        return impl.shipcalls.PutShipcalls(loadedModel)
+        return impl.shipcalls.PutShipcalls(loadedModel, content)
 
     except ValidationError as ex:
         return create_validation_error_response(ex=ex, status_code=400)

src/server/BreCal/api/times.py

@@ -72,7 +72,7 @@ def PutTimes():
 
         # validate the request
         InputValidationTimes.evaluate_put_data(user_data, loadedModel, content)
-        return impl.times.PutTimes(loadedModel)
+        return impl.times.PutTimes(loadedModel, content)
 
     except ValidationError as ex:
         return create_validation_error_response(ex=ex, status_code=400)

src/server/BreCal/impl/shipcalls.py

@@ -185,7 +185,7 @@ def PostShipcalls(schemaModel):
             pooledConnection.close()
 
 
-def PutShipcalls(schemaModel):
+def PutShipcalls(schemaModel, original_payload=None):
     """
 
     :param schemaModel: The deserialized dict of the request
@@ -209,10 +209,12 @@ def PutShipcalls(schemaModel):
         
         was_canceled = theshipcall["canceled"]
 
-        # query = SQLQuery.get_shipcall_put(schemaModel)
+        provided_keys = set(original_payload.keys()) if isinstance(original_payload, dict) else None
-        query = "UPDATE shipcall SET "
+
-        isNotFirst = False
+        update_clauses = []
         for key in schemaModel.keys():
+            if provided_keys is not None and key not in provided_keys:
+                continue
             param_key = key
             if key == "id":
                 continue
@@ -234,19 +236,19 @@ def PutShipcalls(schemaModel):
                 param_key = "evaluation_value"
             if key == "evaluation_value":
                 continue
-            if isNotFirst:
+            update_clauses.append(f"{key} = ?{param_key}?")
-                 query += ", "
-            isNotFirst = True
-            query += key + " = ?" + param_key + "? "
 
-        query += "WHERE id = ?id?"
+        if update_clauses:
+            query = "UPDATE shipcall SET " + ", ".join(update_clauses) + " WHERE id = ?id?"
+            commands.execute(query, param=schemaModel)
 
-        affected_rows = commands.execute(query, param=schemaModel)
+        ship_id_value = schemaModel.get("ship_id") if (provided_keys is None or "ship_id" in provided_keys) else theshipcall["ship_id"]
 
-        shipdata = get_ship_data_for_id(schemaModel["ship_id"])
+        shipdata = get_ship_data_for_id(ship_id_value)
         message = shipdata['name']
-        if "type_value" in schemaModel:
+        type_value = schemaModel.get("type_value") if (provided_keys is None or "type" in provided_keys) else theshipcall["type"]
-            match schemaModel["type_value"]:
+        if type_value is not None:
+            match type_value:
                 case 1:
                     message += " [ARRIVAL]"
                 case 2:
@@ -258,6 +260,9 @@ def PutShipcalls(schemaModel):
         pquery = "SELECT id, participant_id, type FROM shipcall_participant_map where shipcall_id = ?id?"
         pdata = commands.query(pquery,param={"id" : schemaModel["id"]}) # existing list of assignments
 
+        if schemaModel.get("participants") is None:
+            schemaModel["participants"] = []
+
         # loop across passed participant ids, creating entries for those not present in pdata        
 
         existing_notifications = get_notification_for_shipcall_and_type(schemaModel["id"], 1) # type = 1 is assignment
@@ -306,8 +311,9 @@ def PutShipcalls(schemaModel):
                             commands.execute(nquery, param={"shipcall_id" : schemaModel["id"], "participant_id" : elem["participant_id"], "message" : message})
                         break
         
-        if schemaModel["canceled"] is not None:
+        canceled_value = schemaModel.get("canceled")
-            if schemaModel["canceled"] and not was_canceled:
+        if canceled_value is not None:
+            if canceled_value and not was_canceled:
                 # create a canceled notification for all currently assigned participants
                 stornoNotificationQuery = "INSERT INTO notification (shipcall_id, participant_id, level, type, message) VALUES (?shipcall_id?, ?participant_id?, 0, 7, ?message?)"
                 for participant_assignment in schemaModel["participants"]:

src/server/BreCal/impl/times.py

@@ -115,7 +115,7 @@ def PostTimes(schemaModel):
             pooledConnection.close()
 
 
-def PutTimes(schemaModel):
+def PutTimes(schemaModel, original_payload=None):
     """
 
     :param schemaModel: The deserialized model of the record to be inserted
@@ -127,24 +127,33 @@ def PutTimes(schemaModel):
         pooledConnection = local_db.getPoolConnection()
         commands = pydapper.using(pooledConnection)
 
-        query = "UPDATE times SET "
+        sentinel = object()
-        isNotFirst = False
+        existing_times = commands.query_single_or_default("SELECT * FROM times WHERE id = ?id?", sentinel, param={"id": schemaModel["id"]})
+        if existing_times is sentinel:
+            return json.dumps("no such record"), 404, {'Content-Type': 'application/json; charset=utf-8'}
+
+        provided_keys = set(original_payload.keys()) if isinstance(original_payload, dict) else None
+
+        if "shipcall_id" not in schemaModel or (provided_keys is not None and "shipcall_id" not in provided_keys):
+            schemaModel["shipcall_id"] = existing_times["shipcall_id"]
+
+        schemaModel = {k:v.value if isinstance(v, (Enum, Flag)) else v for k,v in schemaModel.items()}
+
+        update_clauses = []
         for key in schemaModel.keys():
+            if provided_keys is not None and key not in provided_keys:
+                continue
             if key == "id":
                 continue
             if key == "created":
                 continue
             if key == "modified":
                 continue
-            if isNotFirst:
+            update_clauses.append(f"{key} = ?{key}?")
-                 query += ", "
-            isNotFirst = True
-            query += key + " = ?" + key + "? "
 
-        query += "WHERE id = ?id?"
+        if update_clauses:
-
+            query = "UPDATE times SET " + ", ".join(update_clauses) + " WHERE id = ?id?"
-        schemaModel = {k:v.value if isinstance(v, (Enum, Flag)) else v for k,v in schemaModel.items()}
+            commands.execute(query, param=schemaModel)
-        affected_rows = commands.execute(query, param=schemaModel)
 
         # apply 'Traffic Light' evaluation to obtain 'GREEN', 'YELLOW' or 'RED' evaluation state. The function internally updates the mysql database 'shipcall'
         evaluate_shipcall_state(mysql_connector_instance=pooledConnection, shipcall_id=schemaModel["shipcall_id"]) # every times data object refers to the 'shipcall_id'

tools/pdf_import/jmueller_parser.py

@@ -0,0 +1,166 @@
+# parser.py
+# Utilities to extract text from the PDF and parse rows into records.
+# Assumes two tables: first is Harbor A, second is Harbor B.
+
+
+from __future__ import annotations
+from csv import reader
+import re
+from typing import List, Dict, Any, Tuple
+
+
+# Optional: If you want OCR fallback later, wire in pdf2image + pytesseract here.
+
+
+def extract_text_lines(pdf_path: str) -> List[str]:
+    """Extract text lines from a PDF using pdfplumber (preferred) with a
+    light fallback to PyPDF2. Returns a list of raw lines."""
+    text = ""
+    
+    try:
+        import pdfplumber
+        with pdfplumber.open(pdf_path) as pdf:
+            pages_text = []
+            for p in pdf.pages:
+                t = p.extract_text() or ""
+                pages_text.append(t)
+            text = "\n".join(pages_text)
+    except Exception:
+
+        try:
+            from PyPDF2 import PdfReader
+            reader = PdfReader(pdf_path)
+            pages_text = []
+            for page in reader.pages:
+                pages_text.append(page.extract_text() or "")
+                text = "\n".join(pages_text)
+        except Exception:
+            text = ""
+
+
+    if not text.strip():
+        raise RuntimeError("No text extracted. If the PDF is scanned, add OCR fallback (pytesseract).")
+
+
+    # Normalize to individual lines
+    lines = [ln.strip() for ln in text.splitlines()]
+    return lines
+
+
+HEADER_PATTERNS = [
+re.compile(r"\bSchiff\b.*\bETA\b.*\bETS\b", re.IGNORECASE),
+re.compile(r"Nächster Hafen|Liegeplatz|Ladung|Lotse", re.IGNORECASE),
+]
+
+
+DATE_TOKEN = re.compile(r"\b\d{1,2}\.\d{1,2}\.(?:\d{4})?")
+TIME_FRAGMENT = r"(?:\s*/\s*\d{1,2}\.\d{2}\s*Uhr\s*\*?)?"
+DT_TOKEN_WITH_TIME = re.compile(r"\d{1,2}\.\d{1,2}\.(?:\d{4})?" + TIME_FRAGMENT)
+
+
+
+
+def cleanse_lines(lines: List[str]) -> List[str]:
+    """Remove known header lines and keep data/blank lines."""
+    out: List[str] = []
+    for ln in lines:
+        if not ln:
+            out.append("")
+            continue
+        if any(p.search(ln) for p in HEADER_PATTERNS):
+            continue
+        out.append(ln)
+    return out
+
+def split_into_tables(lines: List[str]) -> List[List[str]]:
+    """Find candidate data lines (those containing a date token) and split them
+    into up to two blocks separated by at least one blank line. Returns a list
+    of blocks (1 or 2)."""
+    candidate = [ln for ln in lines if (ln == "" or DATE_TOKEN.search(ln))]
+
+
+    blocks: List[List[str]] = []
+    current: List[str] = []
+    seen_data = False
+    for ln in candidate:
+        if ln == "":
+            if seen_data and current:
+                blocks.append(current)
+                current = []
+                seen_data = False
+            continue
+        current.append(ln)
+        seen_data = True
+    if current:
+        blocks.append(current)
+
+
+    if len(blocks) > 2:
+        # Merge any extra blocks into the second
+        blocks = [blocks[0], sum(blocks[1:], [])]
+    return blocks
+
+def parse_line_to_record(ln: str) -> Dict[str, Any]:
+    """Parse a single table line into a minimal record.
+
+
+    Output fields:
+    - ship: text before the first date token
+    - eta_raw: 1st date(+optional time) token as raw string
+    - ets_raw: 2nd date(+optional time) token as raw string (if present)
+    - notes: remainder of the line after the last extracted date token
+    - raw_line: the full original line
+    """
+
+    # Ship name up to the first date token
+    first = DATE_TOKEN.search(ln)
+    ship = ln[: first.start()].strip() if first else ln.strip()
+
+
+    # Extract up to two date(+time) tokens
+    dt_tokens = DT_TOKEN_WITH_TIME.findall(ln)
+    eta_raw = dt_tokens[0].strip() if len(dt_tokens) >= 1 else None
+    ets_raw = dt_tokens[1].strip() if len(dt_tokens) >= 2 else None
+
+
+    # Notes: everything after the last date token we captured
+    notes = ""
+    if dt_tokens:
+        last_match = None
+        it = DT_TOKEN_WITH_TIME.finditer(ln)
+        for last_match in it:
+            pass
+        if last_match:
+            notes = ln[last_match.end() :].strip()
+
+
+    return {
+        "ship": ship,
+        "eta_raw": eta_raw,
+        "ets_raw": ets_raw,
+        "notes": notes,
+        "raw_line": ln,
+    }
+
+
+
+
+def parse_pdf_to_records(pdf_path: str) -> List[Dict[str, Any]]:
+    """High-level: extract lines, cleanse headers, split into 1–2 tables,
+    tag as harbor A/B by order, parse rows → records."""
+
+    lines = extract_text_lines(pdf_path)
+    clean = cleanse_lines(lines)
+    blocks = split_into_tables(clean)
+
+
+    records: List[Dict[str, Any]] = []
+    for i, block in enumerate(blocks):
+        harbor = "A" if i == 0 else "B"
+    for ln in block:
+        if not ln.strip():
+            continue
+        rec = parse_line_to_record(ln)
+        rec["harbor"] = harbor
+        records.append(rec)
+    return records

tools/pdf_import/pdf_to_records.py

@@ -0,0 +1,172 @@
+# pdf_to_records.py
+# CLI: parse a PDF and write JSONL (default) or CSV with one record per row.
+
+
+from __future__ import annotations
+import argparse, json, csv, re
+from pathlib import Path
+from typing import List, Dict, Any
+
+
+# -----------------------------
+# PDF text extraction helpers
+# -----------------------------
+HEADER_PATTERNS = [
+    re.compile(r"\bSchiff\b.*\bETA\b.*\bETS\b", re.IGNORECASE),
+    re.compile(r"Nächster Hafen|Liegeplatz|Ladung|Lotse", re.IGNORECASE),
+]
+DATE_TOKEN = re.compile(r"\b\d{1,2}\.\d{1,2}\.(?:\d{4})?")
+TIME_FRAGMENT = r"(?:\s*/\s*\d{1,2}\.\d{2}\s*Uhr\s*\*?)?"
+DT_TOKEN_WITH_TIME = re.compile(r"\d{1,2}\.\d{1,2}\.(?:\d{4})?" + TIME_FRAGMENT)
+
+
+def extract_text_lines(pdf_path: str) -> List[str]:
+    """Extract raw text lines from the PDF. Prefers pdfplumber with PyPDF2 fallback."""
+    text = ""
+    try:
+        import pdfplumber
+
+        with pdfplumber.open(pdf_path) as pdf:
+            pages_text = [(p.extract_text() or "") for p in pdf.pages]
+            text = "\n".join(pages_text)
+    except Exception:
+        try:
+            from PyPDF2 import PdfReader
+
+            reader = PdfReader(pdf_path)
+            pages_text = [(page.extract_text() or "") for page in reader.pages]
+            text = "\n".join(pages_text)
+        except Exception:
+            text = ""
+
+    if not text.strip():
+        raise RuntimeError(
+            "No text extracted. If the PDF is scanned, consider adding OCR fallback."
+        )
+
+    return [ln.strip() for ln in text.splitlines()]
+
+
+def cleanse_lines(lines: List[str]) -> List[str]:
+    """Remove headers, keep data lines and blanks for table boundaries."""
+    cleaned: List[str] = []
+    for ln in lines:
+        if not ln:
+            cleaned.append("")
+            continue
+        if any(pattern.search(ln) for pattern in HEADER_PATTERNS):
+            continue
+        cleaned.append(ln)
+    return cleaned
+
+
+def split_into_tables(lines: List[str]) -> List[List[str]]:
+    """Split lines into up to two tables, separated by blank lines."""
+    candidate = [ln for ln in lines if (ln == "" or DATE_TOKEN.search(ln))]
+
+    blocks: List[List[str]] = []
+    current: List[str] = []
+    seen_data = False
+    for ln in candidate:
+        if ln == "":
+            if seen_data and current:
+                blocks.append(current)
+                current = []
+                seen_data = False
+            continue
+        current.append(ln)
+        seen_data = True
+    if current:
+        blocks.append(current)
+
+    if len(blocks) > 2:
+        blocks = [blocks[0], sum(blocks[1:], [])]
+    return blocks
+
+
+def parse_line_to_record(ln: str) -> Dict[str, Any]:
+    """Parse a table line into structured fields."""
+    first = DATE_TOKEN.search(ln)
+    ship = ln[: first.start()].strip() if first else ln.strip()
+
+    dt_tokens = DT_TOKEN_WITH_TIME.findall(ln)
+    eta_raw = dt_tokens[0].strip() if len(dt_tokens) >= 1 else None
+    ets_raw = dt_tokens[1].strip() if len(dt_tokens) >= 2 else None
+
+    notes = ""
+    if dt_tokens:
+        last_match = None
+        for last_match in DT_TOKEN_WITH_TIME.finditer(ln):
+            pass
+        if last_match:
+            notes = ln[last_match.end() :].strip()
+
+    return {
+        "ship": ship,
+        "eta_raw": eta_raw,
+        "ets_raw": ets_raw,
+        "notes": notes,
+        "raw_line": ln,
+    }
+
+
+def parse_pdf_to_records(pdf_path: str) -> List[Dict[str, Any]]:
+    """High-level parser: extract text, sanitize, split per harbor, parse rows."""
+    lines = extract_text_lines(pdf_path)
+    clean = cleanse_lines(lines)
+    blocks = split_into_tables(clean)
+
+    records: List[Dict[str, Any]] = []
+    for i, block in enumerate(blocks):
+        harbor = "A" if i == 0 else "B"
+        for ln in block:
+            if not ln.strip():
+                continue
+            rec = parse_line_to_record(ln)
+            rec["harbor"] = harbor
+            records.append(rec)
+
+    return records
+
+
+def write_jsonl(path: Path, rows: List[Dict[str, Any]]):
+    with path.open("w", encoding="utf-8") as f:
+        for r in rows:
+            f.write(json.dumps(r, ensure_ascii=False) + "\n")
+
+
+def write_csv(path: Path, rows: List[Dict[str, Any]]):
+    if not rows:
+        path.write_text("", encoding="utf-8")
+        return
+    fieldnames = ["harbor", "ship", "eta_raw", "ets_raw", "notes"]
+    with path.open("w", newline="", encoding="utf-8") as f:
+        w = csv.DictWriter(f, fieldnames=fieldnames)
+        w.writeheader()
+        for r in rows:
+            w.writerow({k: r.get(k) for k in fieldnames})
+
+
+def main():
+    ap = argparse.ArgumentParser(description="Parse ship tables PDF → records (A/B)")
+    ap.add_argument("pdf", help="Path to partner PDF")
+    ap.add_argument("--out", help="Output file path (default: <pdf>.jsonl)")
+    ap.add_argument("--format", choices=["jsonl", "csv"], default="jsonl")
+    args = ap.parse_args()
+
+
+    rows = parse_pdf_to_records(args.pdf)
+
+
+    out = Path(args.out) if args.out else Path(args.pdf).with_suffix(".jsonl")
+    if args.format == "jsonl":
+        write_jsonl(out, rows)
+    else:
+        write_csv(out, rows)
+
+    print(f"Wrote {len(rows)} records -> {out}")
+
+
+
+if __name__ == "__main__":
+    main()