camera-client 0.2.4__tar.gz → 0.2.6__tar.gz

{camera_client-0.2.4/camera_client.egg-info → camera_client-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camera-client
-Version: 0.2.4
+Version: 0.2.6
 Summary: Python SDK for camera calibration and projection transformations - handle lens distortion, coordinate transformations, and 3D ray casting with symbolic expressions.
 Author-email: Alexander Abramov <extremal.ru@gmail.com>
 License: MIT
@@ -50,6 +50,18 @@ Install from PyPI:
 pip install camera-client
 ```
 
+## CLI Usage
+
+Download camera calibration archives from URL:
+
+```bash
+# Download single archive
+python -m camera_client get_camera_archive https://example.com/camera.npz
+
+# Download from file with URLs (one per line, non-URL lines ignored)
+python -m camera_client get_camera_archive -f urls.txt -o ./archives
+```
+
 ## Quick Start
 
 ```python
@@ -316,6 +328,58 @@ Get the camera position (key-point) in world space.
 **Returns:**
 - `np.ndarray`: Shape (3,) array with [x, y, z] camera position
 
+---
+
+### `get_ctd_points_context(ctd_points)`
+
+Get scale context values for corrected (CTD) image points.
+
+**Parameters:**
+- `ctd_points` (np.ndarray): Shape (N, 2) array of [x, y] corrected coordinates
+
+**Returns:**
+- `dict`: Dictionary with keys:
+  - `wscale` (np.ndarray): Shape (N,) width scale values
+  - `hscale` (np.ndarray): Shape (N,) height scale values
+  - `vangle` (np.ndarray): Shape (N,) vertical angle values (radians)
+
+**Note:** Out-of-bounds points will have NaN values
+
+**Example:**
+```python
+ctd_points = np.array([[640, 480], [800, 600]])
+context = camera.get_ctd_points_context(ctd_points)
+print(context['wscale'])  # Width scale at each point
+print(context['hscale'])  # Height scale at each point
+print(context['vangle'])  # Vertical angle at each point
+```
+
+---
+
+### `get_src_points_context(src_points)`
+
+Get scale context values for source (distorted) image points.
+
+**Parameters:**
+- `src_points` (np.ndarray): Shape (N, 2) array of [x, y] source coordinates
+
+**Returns:**
+- `dict`: Dictionary with keys:
+  - `wscale` (np.ndarray): Shape (N,) width scale values
+  - `hscale` (np.ndarray): Shape (N,) height scale values
+  - `vangle` (np.ndarray): Shape (N,) vertical angle values (radians)
+
+**Note:** Internally converts source points to CTD coordinates first, then retrieves context
+
+**Example:**
+```python
+src_points = np.array([[640, 480], [800, 600]])
+context = camera.get_src_points_context(src_points)
+print(context['wscale'])  # Width scale at each point
+```
+
+---
+
 ## Calibration File Format
 
 The calibration file is a NumPy `.npz` archive containing:

{camera_client-0.2.4 → camera_client-0.2.6}/README.md

@@ -20,6 +20,18 @@ Install from PyPI:
 pip install camera-client
 ```
 
+## CLI Usage
+
+Download camera calibration archives from URL:
+
+```bash
+# Download single archive
+python -m camera_client get_camera_archive https://example.com/camera.npz
+
+# Download from file with URLs (one per line, non-URL lines ignored)
+python -m camera_client get_camera_archive -f urls.txt -o ./archives
+```
+
 ## Quick Start
 
 ```python
@@ -286,6 +298,58 @@ Get the camera position (key-point) in world space.
 **Returns:**
 - `np.ndarray`: Shape (3,) array with [x, y, z] camera position
 
+---
+
+### `get_ctd_points_context(ctd_points)`
+
+Get scale context values for corrected (CTD) image points.
+
+**Parameters:**
+- `ctd_points` (np.ndarray): Shape (N, 2) array of [x, y] corrected coordinates
+
+**Returns:**
+- `dict`: Dictionary with keys:
+  - `wscale` (np.ndarray): Shape (N,) width scale values
+  - `hscale` (np.ndarray): Shape (N,) height scale values
+  - `vangle` (np.ndarray): Shape (N,) vertical angle values (radians)
+
+**Note:** Out-of-bounds points will have NaN values
+
+**Example:**
+```python
+ctd_points = np.array([[640, 480], [800, 600]])
+context = camera.get_ctd_points_context(ctd_points)
+print(context['wscale'])  # Width scale at each point
+print(context['hscale'])  # Height scale at each point
+print(context['vangle'])  # Vertical angle at each point
+```
+
+---
+
+### `get_src_points_context(src_points)`
+
+Get scale context values for source (distorted) image points.
+
+**Parameters:**
+- `src_points` (np.ndarray): Shape (N, 2) array of [x, y] source coordinates
+
+**Returns:**
+- `dict`: Dictionary with keys:
+  - `wscale` (np.ndarray): Shape (N,) width scale values
+  - `hscale` (np.ndarray): Shape (N,) height scale values
+  - `vangle` (np.ndarray): Shape (N,) vertical angle values (radians)
+
+**Note:** Internally converts source points to CTD coordinates first, then retrieves context
+
+**Example:**
+```python
+src_points = np.array([[640, 480], [800, 600]])
+context = camera.get_src_points_context(src_points)
+print(context['wscale'])  # Width scale at each point
+```
+
+---
+
 ## Calibration File Format
 
 The calibration file is a NumPy `.npz` archive containing:

camera_client-0.2.6/camera_client/__main__.py

@@ -0,0 +1,188 @@
+"""Command-line interface for camera-client package."""
+
+import argparse
+import os
+import sys
+from pathlib import Path
+from urllib.request import urlopen, Request
+from urllib.parse import urlparse
+
+
+def is_url(text: str) -> bool:
+    """
+    Check if a string is a valid URL.
+
+    Args:
+        text: String to check
+
+    Returns:
+        True if the string looks like a URL, False otherwise
+    """
+    text = text.strip()
+    return text.startswith('http://') or text.startswith('https://')
+
+
+def download_archive(url: str, output_dir: str = ".", silent: bool = False) -> bool:
+    """
+    Download camera calibration archive from URL to the specified directory.
+
+    Args:
+        url: URL to download the archive from
+        output_dir: Directory to save the downloaded file (default: current directory)
+        silent: If True, suppress success messages (errors still printed)
+
+    Returns:
+        True if download succeeded, False otherwise
+    """
+    try:
+        # Parse the URL to extract filename from path or Content-Disposition header
+        parsed_url = urlparse(url)
+
+        # Create request with headers
+        request = Request(url, headers={'User-Agent': 'camera-client'})
+
+        # Open URL and get response
+        if not silent:
+            print(f"Downloading from: {url}")
+        with urlopen(request) as response:
+            # Try to get filename from Content-Disposition header
+            content_disposition = response.headers.get('Content-Disposition', '')
+            filename = None
+
+            if 'filename=' in content_disposition:
+                # Extract filename from Content-Disposition header
+                parts = content_disposition.split('filename=')
+                if len(parts) > 1:
+                    filename = parts[1].strip('"')
+
+            # Fallback to URL path if no Content-Disposition
+            if not filename:
+                path_parts = parsed_url.path.split('/')
+                filename = path_parts[-1] if path_parts[-1] else 'camera_archive.npz'
+
+            # Ensure .npz extension
+            if not filename.endswith('.npz'):
+                filename += '.npz'
+
+            # Create output path
+            output_path = Path(output_dir) / filename
+
+            # Download file
+            if not silent:
+                print(f"Saving to: {output_path}")
+            with open(output_path, 'wb') as f:
+                f.write(response.read())
+
+            if not silent:
+                print(f"Successfully downloaded: {filename}")
+                print(f"File size: {output_path.stat().st_size} bytes")
+
+            return True
+
+    except Exception as e:
+        print(f"Error downloading archive from {url}: {e}", file=sys.stderr)
+        return False
+
+
+def download_from_file(file_path: str, output_dir: str = ".") -> None:
+    """
+    Download multiple camera calibration archives from URLs listed in a file.
+
+    Non-URL lines (comments, notes, etc.) are automatically skipped.
+
+    Args:
+        file_path: Path to file containing URLs (one per line, non-URL lines are ignored)
+        output_dir: Directory to save the downloaded files (default: current directory)
+    """
+    try:
+        with open(file_path, 'r') as f:
+            # Filter only lines that are valid URLs
+            urls = [line.strip() for line in f if is_url(line)]
+
+        if not urls:
+            print(f"No URLs found in {file_path}", file=sys.stderr)
+            sys.exit(1)
+
+        print(f"Found {len(urls)} URL(s) in {file_path}")
+        print(f"Downloading to: {output_dir}\n")
+
+        success_count = 0
+        failed_count = 0
+
+        for i, url in enumerate(urls, 1):
+            print(f"[{i}/{len(urls)}] Processing: {url}")
+            if download_archive(url, output_dir, silent=False):
+                success_count += 1
+            else:
+                failed_count += 1
+            print()  # Empty line between downloads
+
+        # Summary
+        print("=" * 50)
+        print(f"Download complete: {success_count} succeeded, {failed_count} failed")
+
+        if failed_count > 0:
+            sys.exit(1)
+
+    except FileNotFoundError:
+        print(f"Error: File not found: {file_path}", file=sys.stderr)
+        sys.exit(1)
+    except Exception as e:
+        print(f"Error reading file {file_path}: {e}", file=sys.stderr)
+        sys.exit(1)
+
+
+def main():
+    """Main entry point for camera-client CLI."""
+    parser = argparse.ArgumentParser(
+        prog='camera-client',
+        description='Camera calibration client utilities'
+    )
+
+    subparsers = parser.add_subparsers(dest='command', help='Available commands')
+
+    # get_camera_archive command
+    download_parser = subparsers.add_parser(
+        'get_camera_archive',
+        help='Get camera calibration archive(s) from URL or file'
+    )
+    download_parser.add_argument(
+        'url',
+        nargs='?',
+        help='URL to download the archive from'
+    )
+    download_parser.add_argument(
+        '-f', '--file',
+        help='File containing URLs (one per line)'
+    )
+    download_parser.add_argument(
+        '-o', '--output-dir',
+        default='.',
+        help='Output directory (default: current directory)'
+    )
+
+    args = parser.parse_args()
+
+    if args.command == 'get_camera_archive':
+        # Check that either url or file is provided (but not both)
+        if args.url and args.file:
+            print("Error: Cannot specify both URL and file. Use either positional URL or -f/--file option.", file=sys.stderr)
+            sys.exit(1)
+        elif not args.url and not args.file:
+            print("Error: Must specify either URL or file with -f/--file option.", file=sys.stderr)
+            download_parser.print_help()
+            sys.exit(1)
+
+        # Process based on input type
+        if args.file:
+            download_from_file(args.file, args.output_dir)
+        else:
+            success = download_archive(args.url, args.output_dir)
+            sys.exit(0 if success else 1)
+    else:
+        parser.print_help()
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    main()

{camera_client-0.2.4 → camera_client-0.2.6}/camera_client/client.py

@@ -26,6 +26,7 @@ class CameraProjection:
                 - ctd2src: Corrected to source distortion map (H x W x 2)
                 - x_gnd, y_gnd, z_gnd: String expressions for ctd -> ground
                 - x_im, y_im: String expressions for ground -> ctd
+                - map_scale_h, map_scale_w, map_scale_vang: Scale context maps (H x W)
         """
         data = cam_archive_data
 
@@ -47,6 +48,11 @@ class CameraProjection:
         self.src2ctd_points_map = data["src2ctd"]
         self.ctd2src_points_map = data["ctd2src"]
 
+        # Store scale context maps
+        self.map_scale_h = data["map_scale_h"]
+        self.map_scale_w = data["map_scale_w"]
+        self.map_scale_vang = data["map_scale_vang"]
+
         self.im_size = self.src2ctd_points_map.shape[:2]
 
         # Compile transformation expressions for ctd -> gnd
@@ -294,6 +300,81 @@ class CameraProjection:
         ctd_points = self.src_to_ctd(points)
         return self.ctd_to_ray(ctd_points)
 
+    def get_ctd_points_context(self, ctd_points):
+        """
+        Get scale context values for corrected (CTD) image points.
+
+        Args:
+            ctd_points: (N, 2) array of corrected points [[x1, y1], [x2, y2], ...]
+
+        Returns:
+            Dictionary with keys:
+                - wscale: (N,) array of width scale values
+                - hscale: (N,) array of height scale values
+                - vangle: (N,) array of vertical angle values
+            Out-of-bounds points will have NaN values.
+        """
+        ctd_points = np.asarray(ctd_points, dtype=float)
+        if ctd_points.ndim != 2 or ctd_points.shape[1] != 2:
+            raise ValueError(f"Expected (N, 2) array, got shape {ctd_points.shape}")
+
+        N = len(ctd_points)
+        wscale = np.full(N, np.nan, dtype=float)
+        hscale = np.full(N, np.nan, dtype=float)
+        vangle = np.full(N, np.nan, dtype=float)
+
+        # Check for NaN input points
+        valid_input = ~np.isnan(ctd_points).any(axis=1)
+
+        if not valid_input.any():
+            return {"wscale": wscale, "hscale": hscale, "vangle": vangle}
+
+        # Round to integer coordinates
+        p_int = np.round(ctd_points[valid_input]).astype(int)
+
+        # Vectorized bounds checking
+        in_bounds = (
+            (p_int[:, 0] >= 0)
+            & (p_int[:, 0] < self.map_scale_w.shape[1])
+            & (p_int[:, 1] >= 0)
+            & (p_int[:, 1] < self.map_scale_w.shape[0])
+        )
+
+        # Create mask for points that are both valid input and in bounds
+        valid_indices = np.where(valid_input)[0]
+        final_valid_indices = valid_indices[in_bounds]
+        valid_p_int = p_int[in_bounds]
+
+        # Vectorized lookup using advanced indexing (y, x indexing)
+        wscale[final_valid_indices] = self.map_scale_w[
+            valid_p_int[:, 1], valid_p_int[:, 0]
+        ]
+        hscale[final_valid_indices] = self.map_scale_h[
+            valid_p_int[:, 1], valid_p_int[:, 0]
+        ]
+        vangle[final_valid_indices] = self.map_scale_vang[
+            valid_p_int[:, 1], valid_p_int[:, 0]
+        ]
+
+        return {"wscale": wscale, "hscale": hscale, "vangle": vangle}
+
+    def get_src_points_context(self, src_points):
+        """
+        Get scale context values for source (distorted) image points.
+
+        Args:
+            src_points: (N, 2) array of source points [[x1, y1], [x2, y2], ...]
+
+        Returns:
+            Dictionary with keys:
+                - wscale: (N,) array of width scale values
+                - hscale: (N,) array of height scale values
+                - vangle: (N,) array of vertical angle values
+            Out-of-bounds points will have NaN values.
+        """
+        ctd_points = self.src_to_ctd(src_points)
+        return self.get_ctd_points_context(ctd_points)
+
     @classmethod
     def load(cls, archive_path):
         """

camera_client-0.2.6/camera_client/script.py

@@ -0,0 +1,7 @@
+"""Entry point script for camera-client console command."""
+
+from camera_client.__main__ import main
+
+
+if __name__ == '__main__':
+    main()

{camera_client-0.2.4 → camera_client-0.2.6/camera_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: camera-client
-Version: 0.2.4
+Version: 0.2.6
 Summary: Python SDK for camera calibration and projection transformations - handle lens distortion, coordinate transformations, and 3D ray casting with symbolic expressions.
 Author-email: Alexander Abramov <extremal.ru@gmail.com>
 License: MIT
@@ -50,6 +50,18 @@ Install from PyPI:
 pip install camera-client
 ```
 
+## CLI Usage
+
+Download camera calibration archives from URL:
+
+```bash
+# Download single archive
+python -m camera_client get_camera_archive https://example.com/camera.npz
+
+# Download from file with URLs (one per line, non-URL lines ignored)
+python -m camera_client get_camera_archive -f urls.txt -o ./archives
+```
+
 ## Quick Start
 
 ```python
@@ -316,6 +328,58 @@ Get the camera position (key-point) in world space.
 **Returns:**
 - `np.ndarray`: Shape (3,) array with [x, y, z] camera position
 
+---
+
+### `get_ctd_points_context(ctd_points)`
+
+Get scale context values for corrected (CTD) image points.
+
+**Parameters:**
+- `ctd_points` (np.ndarray): Shape (N, 2) array of [x, y] corrected coordinates
+
+**Returns:**
+- `dict`: Dictionary with keys:
+  - `wscale` (np.ndarray): Shape (N,) width scale values
+  - `hscale` (np.ndarray): Shape (N,) height scale values
+  - `vangle` (np.ndarray): Shape (N,) vertical angle values (radians)
+
+**Note:** Out-of-bounds points will have NaN values
+
+**Example:**
+```python
+ctd_points = np.array([[640, 480], [800, 600]])
+context = camera.get_ctd_points_context(ctd_points)
+print(context['wscale'])  # Width scale at each point
+print(context['hscale'])  # Height scale at each point
+print(context['vangle'])  # Vertical angle at each point
+```
+
+---
+
+### `get_src_points_context(src_points)`
+
+Get scale context values for source (distorted) image points.
+
+**Parameters:**
+- `src_points` (np.ndarray): Shape (N, 2) array of [x, y] source coordinates
+
+**Returns:**
+- `dict`: Dictionary with keys:
+  - `wscale` (np.ndarray): Shape (N,) width scale values
+  - `hscale` (np.ndarray): Shape (N,) height scale values
+  - `vangle` (np.ndarray): Shape (N,) vertical angle values (radians)
+
+**Note:** Internally converts source points to CTD coordinates first, then retrieves context
+
+**Example:**
+```python
+src_points = np.array([[640, 480], [800, 600]])
+context = camera.get_src_points_context(src_points)
+print(context['wscale'])  # Width scale at each point
+```
+
+---
+
 ## Calibration File Format
 
 The calibration file is a NumPy `.npz` archive containing:

{camera_client-0.2.4 → camera_client-0.2.6}/camera_client.egg-info/SOURCES.txt

@@ -5,8 +5,10 @@ pyproject.toml
 requirements.txt
 setup.py
 camera_client/__init__.py
+camera_client/__main__.py
 camera_client/client.py
 camera_client/loading.py
+camera_client/script.py
 camera_client.egg-info/PKG-INFO
 camera_client.egg-info/SOURCES.txt
 camera_client.egg-info/dependency_links.txt

{camera_client-0.2.4 → camera_client-0.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "camera-client"
-version = "0.2.4"
+version = "0.2.6"
 description = "Python SDK for camera calibration and projection transformations - handle lens distortion, coordinate transformations, and 3D ray casting with symbolic expressions."
 readme = "README.md"
 requires-python = ">=3.7"