PyOptik 1.10.1__tar.gz → 1.10.4__tar.gz

{pyoptik-1.10.1 → pyoptik-1.10.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyOptik
-Version: 1.10.1
+Version: 1.10.4
 Summary: A package for refractive index values.
 Author-email: Martin Poinsinet de Sivry-Houle <martin.poinsinet.de.sivry@gmail.com>
 License: MIT License
@@ -43,7 +43,7 @@ Requires-Dist: numpy
 Requires-Dist: matplotlib~=3.8
 Requires-Dist: requests~=2.31
 Requires-Dist: pyyaml~=6.0
-Requires-Dist: MPSPlots~=1.5.1
+Requires-Dist: MPSPlots>=1.6
 Requires-Dist: tabulate~=0.9
 Provides-Extra: testing
 Requires-Dist: pytest<9.0,>=7.4; extra == "testing"

{pyoptik-1.10.1 → pyoptik-1.10.4}/PyOptik/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.10.1'
-__version_tuple__ = version_tuple = (1, 10, 1)
+__version__ = version = '1.10.4'
+__version_tuple__ = version_tuple = (1, 10, 4)

pyoptik-1.10.4/PyOptik/utils.py

@@ -0,0 +1,45 @@
+from PyOptik.directories import sellmeier_data_path, tabulated_data_path
+from PyOptik.material_type import MaterialType
+import requests
+import logging
+
+
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s %(levelname)s %(message)s",
+)
+
+def download_yml_file(url: str, filename: str, location: MaterialType) -> None:
+    """
+    Downloads a .yml file from a specified URL and saves it locally.
+    """
+    match location:
+        case MaterialType.SELLMEIER:
+            file_path = sellmeier_data_path / f"{filename}.yml"
+        case MaterialType.TABULATED:
+            file_path = tabulated_data_path / f"{filename}.yml"
+        case _:
+            raise ValueError(f"Location [{location}] is invalid, it can be either MaterialType.SELLMEIER or MaterialType.TABULATED")
+
+
+    logging.info(f"Starting download of {url!r} → {file_path!s}")
+    try:
+        response = requests.get(url, timeout=10)
+        logging.info(f"Received response: HTTP {response.status_code}")
+        response.raise_for_status()
+
+        file_path.parent.mkdir(parents=True, exist_ok=True)
+
+        with open(file_path, "wb") as f:
+            f.write(response.content)
+        logging.info(f"File downloaded and saved to {file_path}")
+
+    except requests.exceptions.Timeout as e:
+        logging.error(f"Timeout after 10 s when fetching {url!r}: {e}")
+        raise
+    except requests.exceptions.HTTPError as e:
+        logging.error(f"HTTP error while fetching {url!r}: {e}")
+        raise
+    except Exception as e:
+        logging.error(f"Unexpected error: {e}")
+        raise

{pyoptik-1.10.1 → pyoptik-1.10.4}/PyOptik.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyOptik
-Version: 1.10.1
+Version: 1.10.4
 Summary: A package for refractive index values.
 Author-email: Martin Poinsinet de Sivry-Houle <martin.poinsinet.de.sivry@gmail.com>
 License: MIT License
@@ -43,7 +43,7 @@ Requires-Dist: numpy
 Requires-Dist: matplotlib~=3.8
 Requires-Dist: requests~=2.31
 Requires-Dist: pyyaml~=6.0
-Requires-Dist: MPSPlots~=1.5.1
+Requires-Dist: MPSPlots>=1.6
 Requires-Dist: tabulate~=0.9
 Provides-Extra: testing
 Requires-Dist: pytest<9.0,>=7.4; extra == "testing"

{pyoptik-1.10.1 → pyoptik-1.10.4}/PyOptik.egg-info/requires.txt

@@ -5,7 +5,7 @@ numpy
 matplotlib~=3.8
 requests~=2.31
 pyyaml~=6.0
-MPSPlots~=1.5.1
+MPSPlots>=1.6
 tabulate~=0.9
 
 [dev]

{pyoptik-1.10.1 → pyoptik-1.10.4}/docs/source/conf.py

@@ -35,7 +35,6 @@ author = 'Martin Poinsinet de Sivry-Houle'
 
 extensions = [
     'sphinx.ext.mathjax',
-    'pyvista.ext.plot_directive',
     'sphinx_gallery.gen_gallery',
     'sphinx.ext.autodoc',
     'sphinx.ext.napoleon',

{pyoptik-1.10.1 → pyoptik-1.10.4}/meta.yaml

@@ -25,7 +25,7 @@ requirements:
   run:
     - flexparser <0.4  # This is due to a dataclass inheritance problem coming from the pint package
     - pint ~= 0.24
-    - martinpdes::mpsplots
+    - martinpdes::mpsplots >=1.6
     - pyyaml ~=6.0
     - requests ~=2.31
     - matplotlib ~=3.8

{pyoptik-1.10.1 → pyoptik-1.10.4}/pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
     "matplotlib ~=3.8",
     "requests ~=2.31",
     "pyyaml ~=6.0",
-    "MPSPlots ~=1.5.1",
+    "MPSPlots >=1.6",
     "tabulate ~=0.9",
 ]
 

{pyoptik-1.10.1 → pyoptik-1.10.4}/tests/test_utils.py

@@ -154,15 +154,13 @@ def test_create_custom_tabulated_file():
     )
 
 
-def test_download_yml_file_http_error_log(caplog):
-    download_yml_file(
-        filename='example_download',
-        url='__invalid_url__.com',
-        location=MaterialType.SELLMEIER
-    )
-
-    assert 'An error occurred' in caplog.text, "Warning was not raised: {caplog.text}"
-
+def _test_download_yml_file_http_error_log(caplog):
+    with pytest.raises(ValueError):
+        download_yml_file(
+            filename='example_download',
+            url='__invalid_url__.com',
+            location=MaterialType.SELLMEIER
+        )
 
 if __name__ == "__main__":
-    pytest.main(["-W error", __file__])
+    pytest.main(["-W error", "-s", __file__])

pyoptik-1.10.1/PyOptik/utils.py

@@ -1,45 +0,0 @@
-import requests
-import logging
-from PyOptik.directories import sellmeier_data_path, tabulated_data_path
-from PyOptik.material_type import MaterialType
-
-def download_yml_file(url: str, filename: str, location: MaterialType) -> None:
-    """
-    Downloads a .yml file from a specified URL and saves it locally.
-
-    Parameters
-    ----------
-    url : str
-        The URL of the .yml file to download.
-    save_path : str
-        The local path where the .yml file should be saved.
-
-    Raises
-    ------
-        HTTPError: If the download fails due to an HTTP error.
-    """
-    match location:
-        case MaterialType.SELLMEIER:
-            file_path = sellmeier_data_path / f"{filename}.yml"
-        case MaterialType.TABULATED:
-            file_path = tabulated_data_path / f"{filename}.yml"
-        case _:
-            raise ValueError(f"Location [{location}] is invalid, it can be either MaterialType.SELLMEIER or MaterialType.TABULATED")
-
-    try:
-        # Send a GET request to the URL
-        response = requests.get(url)
-        response.raise_for_status()  # Raise an error for bad status codes
-
-        # Save the content of the response as a file
-        file_path.parent.mkdir(parents=True, exist_ok=True)  # Create directories if they don't exist
-
-        with open(file_path, 'wb') as file:
-            file.write(response.content)
-
-        logging.info(f"File downloaded and saved to {file_path}")
-
-    except requests.exceptions.HTTPError as http_err:
-        logging.warning(f"HTTP error occurred: {http_err}")
-    except Exception as err:
-        logging.error(f"An error occurred: {err}")