gammasimtools 0.11.0__tar.gz → 0.12.0__tar.gz

{gammasimtools-0.11.0 → gammasimtools-0.12.0}/CHANGELOG.md

@@ -7,6 +7,14 @@ This changelog is generated using [Towncrier](https://towncrier.readthedocs.io/)
 
 <!-- towncrier release notes start -->
 
+## [0.12.0](https://github.com/gammasim/simtools/tree/0.12.0) - 2025-03-11
+
+### Bugfixes
+
+- Bugfix in database-upload related string to list conversion. ([#1423](https://github.com/gammasim/simtools/pull/1423))
+- Fix setting of `db_api_authentication_database` through env variable. ([#1425](https://github.com/gammasim/simtools/pull/1425))
+
+
 ## [0.11.0](https://github.com/gammasim/simtools/tree/0.11.0) - 2025-03-05
 
 ### Bugfixes

{gammasimtools-0.11.0/src/gammasimtools.egg-info → gammasimtools-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gammasimtools
-Version: 0.11.0
+Version: 0.12.0
 Summary: Tools for the Simulation System of the CTA Observatory
 Author-email: simtools developers <simtools-developer@desy.de>
 License: BSD 3-Clause License

{gammasimtools-0.11.0 → gammasimtools-0.12.0/src/gammasimtools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gammasimtools
-Version: 0.11.0
+Version: 0.12.0
 Summary: Tools for the Simulation System of the CTA Observatory
 Author-email: simtools developers <simtools-developer@desy.de>
 License: BSD 3-Clause License

{gammasimtools-0.11.0 → gammasimtools-0.12.0}/src/simtools/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.11.0'
-__version_tuple__ = version_tuple = (0, 11, 0)
+__version__ = version = '0.12.0'
+__version_tuple__ = version_tuple = (0, 12, 0)

{gammasimtools-0.11.0 → gammasimtools-0.12.0}/src/simtools/configuration/commandline_parser.py

@@ -218,7 +218,7 @@ class CommandLineParser(argparse.ArgumentParser):
             help="database  with user info (optional)",
             type=str,
             required=False,
-            default="admin",
+            default=None,
         )
         _job_group.add_argument(
             "--db_simulation_model",

{gammasimtools-0.11.0 → gammasimtools-0.12.0}/src/simtools/db/db_handler.py

@@ -40,7 +40,7 @@ jsonschema_db_dict = {
         "db_api_user": {"type": "string", "description": "API username"},
         "db_api_pw": {"type": "string", "description": "Password for the API user"},
         "db_api_authentication_database": {
-            "type": "string",
+            "type": ["string", "null"],
             "default": "admin",
             "description": "DB with user info (optional)",
         },
@@ -119,7 +119,9 @@ class DatabaseHandler:
             port=self.mongo_db_config["db_api_port"],
             username=self.mongo_db_config["db_api_user"],
             password=self.mongo_db_config["db_api_pw"],
-            authSource=self.mongo_db_config.get("db_api_authentication_database", "admin"),
+            authSource=self.mongo_db_config.get("db_api_authentication_database")
+            if self.mongo_db_config.get("db_api_authentication_database")
+            else "admin",
             directConnection=direct_connection,
             ssl=not direct_connection,
             tlsallowinvalidhostnames=True,

{gammasimtools-0.11.0 → gammasimtools-0.12.0}/src/simtools/utils/value_conversion.py

@@ -123,13 +123,15 @@ def _split_value_is_quantity(value, is_integer=False):
 
 
 def _split_value_is_string(value, is_integer=False):
-    """Split vale and unit for a string."""
+    """Split value and unit for a string."""
     if value.isdigit():  # single integer value
         return int(value), None
     try:  # single value with/without unit
-        return int(u.Quantity(value).value) if is_integer else u.Quantity(value).value, str(
-            u.Quantity(value).unit
-        )
+        quantity = u.Quantity(value)
+        unit = str(quantity.unit)
+        if unit.isdigit():  # cases where numbers are wrongly identified as units
+            raise ValueError
+        return (int(quantity.value), unit) if is_integer else (quantity.value, unit)
     except ValueError:
         return _split_value_is_list(gen.convert_string_to_list(value), is_integer)
     except TypeError:  # string value (not numerical)

{gammasimtools-0.11.0 → gammasimtools-0.12.0}/tests/integration_tests/config/derive_photon_electron_spectrum_lst_ecsv.yml

@@ -3,6 +3,7 @@ CTA_SIMPIPE:
   APPLICATIONS:
   - APPLICATION: simtools-derive-photon-electron-spectrum
     TEST_NAME: LST_ecsv
+    TEST_USE_CASE: UC-150-2.1.2
     CONFIGURATION:
       INPUT_SPECTRUM: ./tests/resources/SinglePhe_spectrum_totalfit_19pixel-average_20200601.ecsv
       AFTERPULSE_SPECTRUM: ./tests/resources/LST_afterpulses.ecsv

{gammasimtools-0.11.0 → gammasimtools-0.12.0}/tests/integration_tests/config/derive_photon_electron_spectrum_lst_legacy_format.yml

@@ -3,6 +3,7 @@ CTA_SIMPIPE:
   APPLICATIONS:
   - APPLICATION: simtools-derive-photon-electron-spectrum
     TEST_NAME: LST_legacy_format
+    TEST_USE_CASE: UC-150-2.1.2
     CONFIGURATION:
       INPUT_SPECTRUM: ./tests/resources/SinglePhe_spectrum_totalfit_19pixel-average_20200601.csv
       AFTERPULSE_SPECTRUM: ./tests/resources/LST_afterpulses.dat

{gammasimtools-0.11.0 → gammasimtools-0.12.0}/tests/integration_tests/config/submit_model_parameter_from_external_submit_focus_offset.yml

@@ -3,6 +3,7 @@ CTA_SIMPIPE:
   APPLICATIONS:
   - APPLICATION: simtools-submit-model-parameter-from-external
     TEST_NAME: submit_focus_offset
+    TEST_USE_CASE: UC-150-2.1.1
     CONFIGURATION:
       PARAMETER: focus_offset
       VALUE: 6.55 cm, 0.0 deg, 0.0, 0.0

{gammasimtools-0.11.0 → gammasimtools-0.12.0}/tests/integration_tests/config/submit_model_parameter_from_external_submit_mirror_list.yml

@@ -3,6 +3,7 @@ CTA_SIMPIPE:
   APPLICATIONS:
   - APPLICATION: simtools-submit-model-parameter-from-external
     TEST_NAME: submit_mirror_list
+    TEST_USE_CASE: UC-150-2.1.1
     CONFIGURATION:
       PARAMETER: mirror_list
       VALUE: mirror_CTA-100_1.20-86-0.04.dat

{gammasimtools-0.11.0 → gammasimtools-0.12.0}/tests/integration_tests/config/submit_model_parameter_from_external_submit_num_gains.yml

@@ -3,6 +3,7 @@ CTA_SIMPIPE:
   APPLICATIONS:
   - APPLICATION: simtools-submit-model-parameter-from-external
     TEST_NAME: submit_num_gains
+    TEST_USE_CASE: UC-150-2.1.1
     CONFIGURATION:
       PARAMETER: num_gains
       VALUE: 2

{gammasimtools-0.11.0 → gammasimtools-0.12.0}/tests/integration_tests/config/submit_model_parameter_from_external_submit_reference_point_altitude.yml

@@ -3,6 +3,7 @@ CTA_SIMPIPE:
   APPLICATIONS:
   - APPLICATION: simtools-submit-model-parameter-from-external
     TEST_NAME: submit_reference_point_altitude
+    TEST_USE_CASE: UC-150-2.1.1
     CONFIGURATION:
       PARAMETER: reference_point_altitude
       VALUE: 2.177 km

{gammasimtools-0.11.0 → gammasimtools-0.12.0}/tests/integration_tests/config/validate_file_using_schema_json_validate_schema-0.2.0.yml

@@ -3,7 +3,6 @@ CTA_SIMPIPE:
   APPLICATIONS:
   - APPLICATION: simtools-validate-file-using-schema
     TEST_NAME: json_validate_schema-0.2.0
-    TEST_USE_CASE: UC-150-1.1
     CONFIGURATION:
       SCHEMA: src/simtools/schemas/model_parameter.metaschema.yml
       FILE_NAME: tests/resources/model_parameters/schema-0.2.0/num_gains-1.0.0.json

{gammasimtools-0.11.0 → gammasimtools-0.12.0}/tests/unit_tests/configuration/test_configurator.py

@@ -207,7 +207,7 @@ def test_get_db_parameters_from_env(configurator, args_dict):
     args_dict["db_api_pw"] = "12345"
     args_dict["db_api_port"] = 42
     args_dict["db_server"] = "abc@def.de"
-    args_dict["db_api_authentication_database"] = "admin"
+    args_dict["db_api_authentication_database"] = None
     args_dict["db_simulation_model"] = "sim_model"
 
     # remove user defined parameters from comparison (depends on environment)
@@ -329,7 +329,7 @@ def test_get_db_parameters():
     configurator.default_config(add_db_config=True)
     db_params = configurator._get_db_parameters()
     assert db_params == {
-        "db_api_authentication_database": "admin",
+        "db_api_authentication_database": None,
         "db_api_port": None,
         "db_api_pw": None,
         "db_api_user": None,

{gammasimtools-0.11.0 → gammasimtools-0.12.0}/tests/unit_tests/utils/test_value_conversion.py

@@ -149,6 +149,11 @@ def test_split_value_is_string():
     assert value_conversion._split_value_is_string("100 m") == (100, "m")
     assert value_conversion._split_value_is_string("hello") == ("hello", None)
     assert value_conversion._split_value_is_string("100 cm, 200 cm") == ([100, 200], ["cm", "cm"])
+    assert value_conversion._split_value_is_string("100 200") == ([100, 200], [None, None])
+    test_int = value_conversion._split_value_is_string("100", True)
+    assert isinstance(test_int[0], int)
+    assert test_int[1] is None
+    assert test_int[0] == 100
 
 
 def test_split_value_is_list():