From 96c9cddd398eebddbe654887dc24d869f428a40b Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Fri, 2 Aug 2024 12:54:36 -0500
Subject: [PATCH] Add ceilometer to files API
---
.pre-commit-config.yaml | 13 +++++------
metobsapi/util/file_responses.py | 39 +++++++++++++++++++++++++++++++-
2 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 847932a..78e8a6e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,20 +2,20 @@ exclude: '^$'
fail_fast: false
repos:
- repo: https://github.com/psf/black
- rev: 23.1.0
+ rev: 24.4.2
hooks:
- id: black
language_version: python3
args:
- --target-version=py310
- repo: https://github.com/pycqa/isort
- rev: 5.12.0
+ rev: 5.13.2
hooks:
- id: isort
language_version: python3
- repo: https://github.com/charliermarsh/ruff-pre-commit
# Ruff version.
- rev: 'v0.0.254'
+ rev: 'v0.5.6'
hooks:
- id: ruff
# - repo: https://github.com/PyCQA/flake8
@@ -25,13 +25,13 @@ repos:
# additional_dependencies: [flake8-docstrings, flake8-debugger, flake8-bugbear, mccabe]
# args: [--max-complexity, "10"]
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v4.4.0
+ rev: v4.6.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- repo: https://github.com/scop/pre-commit-shfmt
- rev: v3.6.0-1
+ rev: v3.8.0-1
hooks:
# Choose one of:
- id: shfmt # native (requires Go to build)
@@ -44,11 +44,10 @@ repos:
# - id: bandit
# args: [--ini, .bandit]
- repo: https://github.com/pre-commit/mirrors-mypy
- rev: 'v1.0.1' # Use the sha / tag you want to point at
+ rev: 'v1.11.1' # Use the sha / tag you want to point at
hooks:
- id: mypy
additional_dependencies:
- types-docutils
- - types-pkg-resources
- types-PyYAML
- types-requests
diff --git a/metobsapi/util/file_responses.py b/metobsapi/util/file_responses.py
index 2fcef97..7219e60 100644
--- a/metobsapi/util/file_responses.py
+++ b/metobsapi/util/file_responses.py
@@ -1,4 +1,5 @@
"""Configuration for file-based API responses."""
+
from collections import defaultdict
from pathlib import Path
from typing import TypedDict
@@ -37,7 +38,7 @@ ARCHIVE_INFO: dict[str, SiteInfo] = {
"ascii": {
"frequency": ProductFrequency.DAILY_FILE,
"pattern": "aoss_tower.%Y-%m-%d.ascii",
- "display_name": "Daily CSV (rig_tower.YYYY-MM-DD.ascii)",
+ "display_name": "Daily CSV (aoss_tower.YYYY-MM-DD.ascii)",
},
},
},
@@ -135,6 +136,42 @@ ARCHIVE_INFO: dict[str, SiteInfo] = {
},
},
},
+ "ceilo": {
+ "display_name": "Ceilometer",
+ "levels": {
+ "level_00": {
+ "description": L00_DESCRIPTION,
+ "versions": ("version_00",),
+ "products": {
+ "ascii": {
+ "frequency": ProductFrequency.DAILY_FILE,
+ "pattern": "aoss_ceilo.%Y-%m-%d.ascii",
+ "display_name": "Daily CSV (aoss_ceilo.YYYY-MM-DD.ascii)",
+ },
+ },
+ },
+ "level_b1": {
+ "description": LB1_DESCRIPTION,
+ "versions": ("version_00",),
+ "products": {
+ # 'nc-monthly': {
+ # },
+ "nc-daily": {
+ "frequency": ProductFrequency.DAILY_FILE,
+ "pattern": "aoss_ceilo.%Y-%m-%d.nc",
+ "display_name": "Daily NetCDF file (aoss_ceilo.YYYY-MM-DD.nc)",
+ "preview_product": "meteorogram-daily",
+ },
+ "backscatter-daily": {
+ "frequency": ProductFrequency.DAILY_FILE,
+ "pattern": "aoss_ceilo.%Y-%m-%d_000000_235959.png",
+ "thumbnail_pattern": "aoss_ceilo.%Y-%m-%d_000000_235959_tn.png",
+ "display_name": "Daily Backscatter (aoss_ceilo.YYYY-MM-DD.png)",
+ },
+ },
+ },
+ },
+ },
},
},
"mendota": {
--
GitLab