voxcity 0.6.19__py3-none-any.whl → 0.6.20__py3-none-any.whl

voxcity/downloader/citygml.py

@@ -156,13 +156,16 @@ def get_tile_polygon_from_filename(filename):
 # Original script logic
 # --------------------------------------------------------------------
 
-def download_and_extract_zip(url, extract_to='.'):
+def download_and_extract_zip(url, extract_to='.', ssl_verify=True, ca_bundle=None, timeout=60):
     """
     Download and extract a zip file from a URL to specified directory.
 
     Args:
         url (str): URL of the zip file to download.
         extract_to (str): Directory to extract files to (default: current directory).
+        ssl_verify (bool): Whether to verify SSL certificates (default: True).
+        ca_bundle (str|None): Path to a CA bundle file. Overrides verify when provided.
+        timeout (int|float): Request timeout in seconds (default: 60).
 
     Returns:
         tuple: (extraction_path, folder_name) where files were extracted.
@@ -171,21 +174,27 @@ def download_and_extract_zip(url, extract_to='.'):
         - Creates a subdirectory named after the zip file (without .zip)
         - Prints status messages for success/failure
     """
-    response = requests.get(url)
-    if response.status_code == 200:
-        parsed_url = urlparse(url)
-        zip_filename = os.path.basename(parsed_url.path)
-        folder_name = os.path.splitext(zip_filename)[0]  # Remove the .zip extension
-
-        extraction_path = os.path.join(extract_to, folder_name)
-        os.makedirs(extraction_path, exist_ok=True)
-
-        zip_file = io.BytesIO(response.content)
-        with zipfile.ZipFile(zip_file) as z:
-            z.extractall(extraction_path)
-            print(f"Extracted to {extraction_path}")
-    else:
-        print(f"Failed to download the file. Status code: {response.status_code}")
+    verify_arg = ca_bundle if ca_bundle else ssl_verify
+    try:
+        response = requests.get(url, verify=verify_arg, timeout=timeout)
+        if response.status_code == 200:
+            parsed_url = urlparse(url)
+            zip_filename = os.path.basename(parsed_url.path)
+            folder_name = os.path.splitext(zip_filename)[0]  # Remove the .zip extension
+
+            extraction_path = os.path.join(extract_to, folder_name)
+            os.makedirs(extraction_path, exist_ok=True)
+
+            zip_file = io.BytesIO(response.content)
+            with zipfile.ZipFile(zip_file) as z:
+                z.extractall(extraction_path)
+                print(f"Extracted to {extraction_path}")
+        else:
+            print(f"Failed to download the file. Status code: {response.status_code}")
+    except requests.exceptions.SSLError as e:
+        print("SSL error when downloading CityGML zip. You can pass 'ssl_verify=False' to skip verification, "
+              "or provide a CA bundle path via 'ca_bundle'. Error:", e)
+        raise
 
     return extraction_path, folder_name
 
@@ -848,7 +857,10 @@ def swap_coordinates_if_needed(gdf, geometry_col='geometry'):
 def load_buid_dem_veg_from_citygml(url=None, 
                               base_dir='.', 
                               citygml_path=None,
-                              rectangle_vertices=None):
+                              rectangle_vertices=None,
+                              ssl_verify=True,
+                              ca_bundle=None,
+                              timeout=60):
     """
     Load and process PLATEAU data from URL or local files.
 
@@ -879,7 +891,9 @@ def load_buid_dem_veg_from_citygml(url=None,
         rectangle_polygon = Polygon(rectangle_vertices)
     
     if url:
-        citygml_path, foldername = download_and_extract_zip(url, extract_to=base_dir)
+        citygml_path, foldername = download_and_extract_zip(
+            url, extract_to=base_dir, ssl_verify=ssl_verify, ca_bundle=ca_bundle, timeout=timeout
+        )
     elif citygml_path:
         foldername = os.path.basename(citygml_path)
     else:

voxcity/generator.py

@@ -921,8 +921,22 @@ def get_voxcity_CityGML(rectangle_vertices, land_cover_source, canopy_height_sou
     # Remove 'output_dir' from kwargs to prevent duplication
     kwargs.pop('output_dir', None)
 
+    # SSL/HTTP options for CityGML download (optional)
+    # Backward compatible: accept 'verify' but prefer 'ssl_verify'
+    ssl_verify = kwargs.pop('ssl_verify', kwargs.pop('verify', True))
+    ca_bundle = kwargs.pop('ca_bundle', None)
+    timeout = kwargs.pop('timeout', 60)
+
     # get all required gdfs    
-    building_gdf, terrain_gdf, vegetation_gdf = load_buid_dem_veg_from_citygml(url=url_citygml, citygml_path=citygml_path, base_dir=output_dir, rectangle_vertices=rectangle_vertices)
+    building_gdf, terrain_gdf, vegetation_gdf = load_buid_dem_veg_from_citygml(
+        url=url_citygml,
+        citygml_path=citygml_path,
+        base_dir=output_dir,
+        rectangle_vertices=rectangle_vertices,
+        ssl_verify=ssl_verify,
+        ca_bundle=ca_bundle,
+        timeout=timeout
+    )
 
     # Normalize CRS to WGS84 (EPSG:4326) to ensure consistent operations downstream
     try:

voxcity/simulator/solar.py

@@ -1007,10 +1007,15 @@ def get_global_solar_irradiance_using_epw(
                 output_dir=output_dir,
                 max_distance=max_distance,
                 extract_zip=True,
-                load_data=True
+                load_data=True,
+                allow_insecure_ssl=kwargs.get("allow_insecure_ssl", False),
+                allow_http_fallback=kwargs.get("allow_http_fallback", False),
+                ssl_verify=kwargs.get("ssl_verify", True)
             )
 
     # Read EPW data
+    if epw_file_path is None:
+        raise RuntimeError("EPW file path is None. Set 'epw_file_path' or enable 'download_nearest_epw' and ensure network succeeds.")
     df, lon, lat, tz, elevation_m = read_epw_for_solar_simulation(epw_file_path)
     if df.empty:
         raise ValueError("No data in EPW file.")
@@ -2030,10 +2035,15 @@ def get_building_global_solar_irradiance_using_epw(
                 output_dir=output_dir,
                 max_distance=max_distance,
                 extract_zip=True,
-                load_data=True
+                load_data=True,
+                allow_insecure_ssl=kwargs.get("allow_insecure_ssl", False),
+                allow_http_fallback=kwargs.get("allow_http_fallback", False),
+                ssl_verify=kwargs.get("ssl_verify", True)
             )
 
     # Read EPW data
+    if epw_file_path is None:
+        raise RuntimeError("EPW file path is None. Set 'epw_file_path' or enable 'download_nearest_epw' and ensure network succeeds.")
     df, lon, lat, tz, elevation_m = read_epw_for_solar_simulation(epw_file_path)
     if df.empty:
         raise ValueError("No data in EPW file.")

voxcity/utils/weather.py

@@ -209,7 +209,9 @@ def process_epw(epw_path: Union[str, Path]) -> Tuple[pd.DataFrame, Dict]:
 # =============================================================================
 
 def get_nearest_epw_from_climate_onebuilding(longitude: float, latitude: float, output_dir: str = "./", max_distance: Optional[float] = None, 
-                extract_zip: bool = True, load_data: bool = True, region: Optional[Union[str, List[str]]] = None) -> Tuple[Optional[str], Optional[pd.DataFrame], Optional[Dict]]:
+                extract_zip: bool = True, load_data: bool = True, region: Optional[Union[str, List[str]]] = None,
+                allow_insecure_ssl: bool = False, allow_http_fallback: bool = False,
+                ssl_verify: Union[bool, str] = True) -> Tuple[Optional[str], Optional[pd.DataFrame], Optional[Dict]]:
     """
     Download and process EPW weather file from Climate.OneBuilding.Org based on coordinates.
     
@@ -243,6 +245,9 @@ def get_nearest_epw_from_climate_onebuilding(longitude: float, latitude: float,
                                             plus legacy "Canada", "USA", "Caribbean" (Region 4).
                                             Use "all" to scan every dataset.
                                             If None, will auto-detect region based on coordinates.
+            allow_insecure_ssl (bool): If True, on SSL errors retry with certificate verification disabled.
+            allow_http_fallback (bool): If True, on SSL/network errors, also try HTTP (insecure) fallback.
+            ssl_verify (bool|str): Passed to requests as 'verify' parameter for HTTPS; can be False or CA bundle path.
     
     Returns:
         Tuple containing:
@@ -629,9 +634,36 @@ def get_nearest_epw_from_climate_onebuilding(longitude: float, latitude: float,
                 continue
             tried.add(u)
             try:
-                resp = requests.get(u, timeout=timeout_s)
+                resp = requests.get(u, timeout=timeout_s, verify=ssl_verify)
                 resp.raise_for_status()
                 return resp.content
+            except requests.exceptions.SSLError:
+                # Retry with user-controlled insecure SSL
+                if allow_insecure_ssl:
+                    try:
+                        resp = requests.get(u, timeout=timeout_s, verify=False)
+                        resp.raise_for_status()
+                        return resp.content
+                    except requests.exceptions.RequestException:
+                        if allow_http_fallback and u.lower().startswith("https://"):
+                            insecure_url = "http://" + u.split("://", 1)[1]
+                            try:
+                                resp = requests.get(insecure_url, timeout=timeout_s)
+                                resp.raise_for_status()
+                                return resp.content
+                            except requests.exceptions.RequestException:
+                                pass
+                        continue
+                else:
+                    if allow_http_fallback and u.lower().startswith("https://"):
+                        insecure_url = "http://" + u.split("://", 1)[1]
+                        try:
+                            resp = requests.get(insecure_url, timeout=timeout_s)
+                            resp.raise_for_status()
+                            return resp.content
+                        except requests.exceptions.RequestException:
+                            pass
+                    continue
             except requests.exceptions.HTTPError as he:
                 # Only continue on 404; raise on other HTTP errors
                 if getattr(he.response, "status_code", None) == 404:
@@ -658,9 +690,32 @@ def get_nearest_epw_from_climate_onebuilding(longitude: float, latitude: float,
             List of dictionaries containing station metadata
         """
         try:
-            # Download KML file with timeout
-            response = requests.get(kml_url, timeout=30)
-            response.raise_for_status()
+            # Download KML file with timeout (secure first)
+            try:
+                response = requests.get(kml_url, timeout=30, verify=ssl_verify)
+                response.raise_for_status()
+            except requests.exceptions.SSLError:
+                if allow_insecure_ssl:
+                    # Retry with certificate verification disabled (last resort)
+                    try:
+                        response = requests.get(kml_url, timeout=30, verify=False)
+                        response.raise_for_status()
+                    except requests.exceptions.RequestException:
+                        # Try HTTP fallback if original was HTTPS and allowed
+                        if allow_http_fallback and kml_url.lower().startswith("https://"):
+                            insecure_url = "http://" + kml_url.split("://", 1)[1]
+                            response = requests.get(insecure_url, timeout=30)
+                            response.raise_for_status()
+                        else:
+                            raise
+                else:
+                    # Try HTTP fallback only if allowed and original was HTTPS
+                    if allow_http_fallback and kml_url.lower().startswith("https://"):
+                        insecure_url = "http://" + kml_url.split("://", 1)[1]
+                        response = requests.get(insecure_url, timeout=30)
+                        response.raise_for_status()
+                    else:
+                        raise
             
             # Try to decode content with multiple encodings
             content = try_decode(response.content)
@@ -917,8 +972,15 @@ def read_epw_for_solar_simulation(epw_file_path):
     Raises:
         ValueError: If LOCATION line not found or data parsing fails
     """
+    # Validate input path
+    if epw_file_path is None:
+        raise TypeError("EPW file path is None. Provide a valid path or ensure download succeeded.")
+    epw_path_obj = Path(epw_file_path)
+    if not epw_path_obj.exists() or not epw_path_obj.is_file():
+        raise FileNotFoundError(f"EPW file not found: {epw_file_path}")
+
     # Read the entire EPW file
-    with open(epw_file_path, 'r', encoding='utf-8') as f:
+    with open(epw_path_obj, 'r', encoding='utf-8') as f:
         lines = f.readlines()
 
     # Find the LOCATION line (first line in EPW format)

{voxcity-0.6.19.dist-info → voxcity-0.6.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voxcity
-Version: 0.6.19
+Version: 0.6.20
 Summary: voxcity is an easy and one-stop tool to output 3d city models for microclimate simulation by integrating multiple geospatial open-data
 License: MIT
 License-File: AUTHORS.rst

{voxcity-0.6.19.dist-info → voxcity-0.6.20.dist-info}/RECORD

@@ -1,6 +1,6 @@
 voxcity/__init__.py,sha256=el9v3gfybHOF_GUYPeSOqN0-vCrTW0eU1mcvi0sEfeU,252
 voxcity/downloader/__init__.py,sha256=o_T_EU7hZLGyXxX9wVWn1x-OAa3ThGYdnpgB1_2v3AE,151
-voxcity/downloader/citygml.py,sha256=vEsMDCjK64UwpCmQi6ELoqC7h5sbIUW8hWAxVf5ViNI,41321
+voxcity/downloader/citygml.py,sha256=I8-wWijqVOA1VeH3nFP9ZlC3l6XvXfli6lB17ZIXHb0,42232
 voxcity/downloader/eubucco.py,sha256=ln1YNaaOgJfxNfCtVbYaMm775-bUvpAA_LDv60_i22w,17875
 voxcity/downloader/gee.py,sha256=nvJvYqcSZyyontRtG2cFeb__ZJfeY4rRN1NBPORxLwQ,23557
 voxcity/downloader/mbfp.py,sha256=UXDVjsO0fnb0fSal9yqrSFEIBThnRmnutnp08kZTmCA,6595
@@ -14,7 +14,7 @@ voxcity/exporter/envimet.py,sha256=Sh7s1JdQ6SgT_L2Xd_c4gtEGWK2hTS87bccaoIqik-s,3
 voxcity/exporter/magicavoxel.py,sha256=SfGEgTZRlossKx3Xrv9d3iKSX-HmfQJEL9lZHgWMDX4,12782
 voxcity/exporter/netcdf.py,sha256=48rJ3wDsFhi9ANbElhMjXLxWMJoJzBt1gFbN0ekPp-A,7404
 voxcity/exporter/obj.py,sha256=7xmVSQ_y-X8QLjNdASDPsaltGvmyW9-yAacocByYKl4,58160
-voxcity/generator.py,sha256=4WSjO09f8z3zt0tpKY0fyAfOMym1JT4VH3Tt1lOg2Bk,66900
+voxcity/generator.py,sha256=OHSZU4z7Vj6Iqbp1J0xXlFUSPyMsvOgPv3Tren8mEBc,67302
 voxcity/geoprocessor/__init__.py,sha256=WYxcAQrjGucIvGHF0JTC6rONZzL3kCms1S2vpzS6KaU,127
 voxcity/geoprocessor/draw.py,sha256=AZMWq23wxxDJygNloCbVzWAAr1JO7nC94umf9LSxJ5o,49248
 voxcity/geoprocessor/grid.py,sha256=NmlQwl1nJpS7MduVtJeJCG-xBfVIwKTOip7pMm3RhsY,76722
@@ -23,16 +23,16 @@ voxcity/geoprocessor/network.py,sha256=YynqR0nq_NUra_cQ3Z_56KxfRia1b6-hIzGCj3QT-
 voxcity/geoprocessor/polygon.py,sha256=DfzXf6R-qoWXEZv1z1aHCVfr-DCuCFw6lieQT5cNHPA,61188
 voxcity/geoprocessor/utils.py,sha256=s17XpgkLBelmNCk2wcUwTK1tEiFpguWR2BF_n7K17jg,31378
 voxcity/simulator/__init__.py,sha256=APdkcdaovj0v_RPOaA4SBvFUKT2RM7Hxuuz3Sux4gCo,65
-voxcity/simulator/solar.py,sha256=4WBFgMm25-9rZ5bSGBmIpaxq2mma9X46Fom7UvGEnT8,106361
+voxcity/simulator/solar.py,sha256=4D5t2I79vBW1qXd90BZR0tMiA9WOEXWLG5b-d6E2XbQ,107127
 voxcity/simulator/utils.py,sha256=sEYBB2-hLJxTiXQps1_-Fi7t1HN3-1OPOvBCWtgIisA,130
 voxcity/simulator/view.py,sha256=k3FoS6gsibR-eDrTHJivJSQfvN3Tg8R8eSTeMqd9ans,93942
 voxcity/utils/__init__.py,sha256=Q-NYCqYnAAaF80KuNwpqIjbE7Ec3Gr4y_khMLIMhJrg,68
 voxcity/utils/lc.py,sha256=722Gz3lPbgAp0mmTZ-g-QKBbAnbxrcgaYwb1sa7q8Sk,16189
 voxcity/utils/material.py,sha256=H8K8Lq4wBL6dQtgj7esUW2U6wLCOTeOtelkTDJoRgMo,10007
 voxcity/utils/visualization.py,sha256=_c5WnhA0fawkseUviKEIpUUsF-M-OOLOT9FrpgQIh1A,118556
-voxcity/utils/weather.py,sha256=WcmohW0yx2-uNMO5ffgxCtKUt32q6PQsAT43P5DwJx4,44760
-voxcity-0.6.19.dist-info/licenses/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
-voxcity-0.6.19.dist-info/licenses/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
-voxcity-0.6.19.dist-info/METADATA,sha256=AUmkbdSOZM7RywhizzSM_xzphJ-QLbQEuHx9IjvGSKQ,26212
-voxcity-0.6.19.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
-voxcity-0.6.19.dist-info/RECORD,,
+voxcity/utils/weather.py,sha256=cb6ZooL42Hc4214OtFiJ78cCgWYM6VE-DU8S3e-urRg,48449
+voxcity-0.6.20.dist-info/licenses/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
+voxcity-0.6.20.dist-info/licenses/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
+voxcity-0.6.20.dist-info/METADATA,sha256=dRyklxMxGHwtTvE6lT3TfMFIlWBDZ354zt1Dr_Vv7qQ,26212
+voxcity-0.6.20.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
+voxcity-0.6.20.dist-info/RECORD,,