honeybee-radiance 1.66.165__tar.gz → 1.66.215__tar.gz

{honeybee_radiance-1.66.165 → honeybee_radiance-1.66.215}/PKG-INFO

@@ -1,23 +1,37 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: honeybee-radiance
-Version: 1.66.165
+Version: 1.66.215
 Summary: Daylight and light simulation extension for honeybee.
 Home-page: https://github.com/ladybug-tools/honeybee-radiance
 Author: Ladybug Tools
 Author-email: info@ladybug.tools
 License: AGPL-3.0
 Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: License :: OSI Approved :: GNU Affero General Public License v3
+Classifier: Programming Language :: Python :: Implementation :: IronPython
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: honeybee-core==1.61.14
+Requires-Dist: honeybee-core==1.64.8
 Requires-Dist: honeybee-radiance-folder==2.11.16
 Requires-Dist: honeybee-radiance-command==1.22.5
 Requires-Dist: honeybee-standards==2.0.7
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 # honeybee-radiance
 

{honeybee_radiance-1.66.165 → honeybee_radiance-1.66.215}/dev-requirements.txt

@@ -1,13 +1,13 @@
-pytest==7.4.4;python_version>='3.6'
+pytest==8.3.2;python_version>='3.6'
 Sphinx==8.0.2;python_version>='3.6'
 sphinx-bootstrap-theme==0.8.1
 sphinxcontrib-fulltoc==1.2.0
 sphinxcontrib-websupport==2.0.0;python_version>='3.6'
 sphinx-click==6.0.0;python_version>='3.6'
-twine==5.1.1;python_version>='3.6'
-wheel==0.44.0;python_version>='3.6'
-setuptools==75.1.0;python_version>='3.6'
-importlib-metadata==8.5.0;python_version>='3.6'
+twine==6.1.0;python_version>='3.6'
+wheel==0.45.1;python_version>='3.6'
+setuptools==80.9.0;python_version>='3.6'
+build==1.3.0;python_version>='3.6'
 pytest==4.6.9;python_version<'3.0'
 Sphinx==1.8.5;python_version<'3.0'
 sphinxcontrib-websupport==1.1.2;python_version<'3.0'
@@ -15,4 +15,5 @@ sphinx-click==4.4.0;python_version<'3.0'
 twine==1.13.0;python_version<'3.0'
 wheel==0.38.1;python_version<'3.0'
 setuptools==44.1.0;python_version<'3.0'
+build==0.1.0;python_version<'3.0'
 importlib-metadata==2.0.0;python_version<'3.0'

{honeybee_radiance-1.66.165 → honeybee_radiance-1.66.215}/honeybee_radiance/cli/glare.py

@@ -18,13 +18,20 @@ def dcglare():
 
 @dcglare.command('two-phase')
 @click.argument(
-    'dc-direct', type=click.Path(exists=True, dir_okay=False, resolve_path=True))
+    'dc-direct',
+    type=click.Path(exists=True, file_okay=True, dir_okay=False, resolve_path=True)
+)
 @click.argument(
-    'dc-total', type=click.Path(exists=True, dir_okay=False, resolve_path=True))
+    'dc-total',
+    type=click.Path(exists=True, file_okay=True, dir_okay=False, resolve_path=True)
+)
 @click.argument(
-    'sky-mtx', type=click.Path(exists=True, dir_okay=False, resolve_path=True))
+    'sky-mtx',
+    type=click.Path(exists=True, file_okay=True, dir_okay=False, resolve_path=True)
+)
 @click.argument(
-    'view-rays', type=click.Path(exists=True, dir_okay=False, resolve_path=True)
+    'view-rays',
+    type=click.Path(exists=True, file_okay=True, dir_okay=False, resolve_path=True)
 )
 @click.option(
     '--glare-limit', '-l', type=float,
@@ -51,7 +58,8 @@ def dcglare():
     '--glare-limit (or -l) is specified.'
 )
 @click.option(
-    '--output', '-o', help='Path to output file. If a relative path is provided it '
+    '--output', '-o', default='output.dgp',
+    help='Path to output file. If a relative path is provided it '
     'should be relative to project folder.'
 )
 @click.option(
@@ -84,8 +92,10 @@ def two_phase_command(
             options.b = threshold_factor
         if occupancy_schedule:
             options.sf = occupancy_schedule
-
-        # create command.
+        # create command
+        out_dir = os.path.dirname(output)
+        if out_dir and not os.path.isdir(out_dir):
+            os.makedirs(out_dir)
         dcglare = Dcglare(
             options=options, output=output,
             dc_direct=dc_direct, dc_total=dc_total, sky_matrix=sky_mtx

{honeybee_radiance-1.66.165 → honeybee_radiance-1.66.215}/honeybee_radiance/cli/study.py

@@ -21,12 +21,15 @@ def study():
 @click.argument(
     'wea', type=click.Path(exists=True, dir_okay=False, resolve_path=True))
 @click.argument('timestep', type=click.INT)
+@click.option(
+    '--study-type', '-st', help='Type of study, e.g., annual-daylight or annual-irradiance',
+    default='annual-daylight', show_default=True)
 @click.option('--folder', '-f', help='Output folder.', default='.', show_default=True)
 @click.option(
     '--name', '-n', help='Output file name study info.',
     type=click.STRING, default='study_info', show_default=True
 )
-def study_info(wea, timestep, folder, name):
+def study_info(wea, timestep, study_type, folder, name):
     """Create a study info file.
 
     This command generates a study info file with the timestep and the hoys of
@@ -50,6 +53,7 @@ def study_info(wea, timestep, folder, name):
         wea = Wea.from_file(wea, timestep=timestep)
         study_info['timestep'] = timestep
         study_info['study_hours'] = wea.hoys
+        study_info['study_type'] = study_type
 
         if not os.path.isdir(folder):
             os.makedirs(folder)

{honeybee_radiance-1.66.165 → honeybee_radiance-1.66.215}/honeybee_radiance/cli/translate.py

@@ -184,6 +184,9 @@ def model_to_rad_folder(
                         grid_size, offset=offset, wall_offset=wall_offset))
                 model.properties.radiance.sensor_grids = sensor_grids
                 model.to_hbjson('output_model', '.')
+            else:
+                file_extension = os.path.splitext(model_file)[1]
+                shutil.copy(model_file, 'output_model' + file_extension)
         else:
             file_extension = os.path.splitext(model_file)[1]
             shutil.copy(model_file, 'output_model' + file_extension)

{honeybee_radiance-1.66.165 → honeybee_radiance-1.66.215}/honeybee_radiance/cli/viewfactor.py

@@ -160,8 +160,8 @@ def create_view_factor_modifiers(
                     mod_name = '%s_mod' % poly_id
                     mod_names.append(mod_name)
                     white_plastic.identifier = mod_name
-                    base_geo = white_plastic.identifier + ' polygon {} 0 0 9 {}'
-                    geo_str = base_geo.format(poly_id, ' '.join(coords))
+                    base_geo = white_plastic.identifier + ' polygon {} 0 0 {} {}'
+                    geo_str = base_geo.format(poly_id, len(coords), ' '.join(coords))
                     geo_strs.append(geo_str)
                     mod_strs.append(white_plastic.to_radiance(True, False, False))
         else:
@@ -173,14 +173,14 @@ def create_view_factor_modifiers(
                 geo_strs.append(rad_poly.to_radiance(False, False, False))
             for shade_mesh in model.shade_meshes:
                 shade_mesh.properties.radiance.modifier = white_plastic
-                base_geo = white_plastic.identifier + ' polygon {} 0 0 9 {}'
+                base_geo = white_plastic.identifier + ' polygon {} 0 0 {} {}'
                 shd_id = shade_mesh.identifier
                 str_vertices = tuple(tuple(str(v) for v in pt.to_array())
                                     for pt in shade_mesh.vertices)
                 for fi, f_geo in enumerate(shade_mesh.faces):
                     coords = tuple(v for pt in f_geo for v in str_vertices[pt])
                     poly_id = '{}_{}'.format(shd_id, fi)
-                    geo_str = base_geo.format(poly_id, ' '.join(coords))
+                    geo_str = base_geo.format(poly_id, len(coords), ' '.join(coords))
                     geo_strs.append(geo_str)
 
         # add the ground and sky domes if requested

{honeybee_radiance-1.66.165 → honeybee_radiance-1.66.215}/honeybee_radiance/properties/model.py

@@ -46,6 +46,14 @@ class ModelRadianceProperties(object):
         * has_sensor_grids
         * has_views
     """
+    ERROR_MAP = {
+        '010001': 'check_duplicate_modifier_identifiers',
+        '010002': 'check_duplicate_modifier_set_identifiers',
+        '010003': 'check_duplicate_sensor_grid_identifiers',
+        '010004': 'check_duplicate_view_identifiers',
+        '010005': 'check_sensor_grid_rooms_in_model',
+        '010006': 'check_view_rooms_in_model'
+    }
 
     def __init__(self, host, sensor_grids=None, views=None):
         """Initialize Model radiance properties."""
@@ -593,8 +601,43 @@ class ModelRadianceProperties(object):
         msgs.append(self.host.check_rooms_solid(tol, ang_tol, False, detailed))
 
         # perform checks that are specific to Radiance
-        msgs.append(self.check_duplicate_modifier_identifiers(False, detailed))
-        msgs.append(self.check_duplicate_modifier_set_identifiers(False, detailed))
+        msgs.append(self.check_duplicate_sensor_grid_identifiers(False, detailed))
+        msgs.append(self.check_duplicate_view_identifiers(False, detailed))
+        msgs.append(self.check_sensor_grid_rooms_in_model(False, detailed))
+        msgs.append(self.check_view_rooms_in_model(False, detailed))
+        # output a final report of errors or raise an exception
+        full_msgs = [msg for msg in msgs if msg]
+        if detailed:
+            return [m for msg in full_msgs for m in msg]
+        full_msg = '\n'.join(full_msgs)
+        if raise_exception and len(full_msgs) != 0:
+            raise ValueError(full_msg)
+        return full_msg
+
+    def check_generic(self, raise_exception=True, detailed=False):
+        """Check generic of the aspects of the Model radiance properties.
+
+        This includes checks for everything except duplicate identifiers for
+        modifiers and modifier sets. Typically, these checks just add to the
+        validation time without providing useful information since extension
+        objects with duplicate IDs are lost during HBJSON serialization. Checks
+        for duplicate sensor grid and view IDs are still performed.
+
+        Args:
+            raise_exception: Boolean to note whether a ValueError should be raised
+                if any errors are found. If False, this method will simply
+                return a text string with all errors that were found.
+            detailed: Boolean for whether the returned object is a detailed list of
+                dicts with error info or a string with a message. (Default: False).
+
+        Returns:
+            A text string with all errors that were found or a list if detailed is True.
+            This string (or list) will be empty if no errors were found.
+        """
+        # set up defaults to ensure the method runs correctly
+        detailed = False if raise_exception else detailed
+        msgs = []
+        # perform checks for specific radiance simulation rules
         msgs.append(self.check_duplicate_sensor_grid_identifiers(False, detailed))
         msgs.append(self.check_duplicate_view_identifiers(False, detailed))
         msgs.append(self.check_sensor_grid_rooms_in_model(False, detailed))
@@ -625,13 +668,44 @@ class ModelRadianceProperties(object):
         # set up defaults to ensure the method runs correctly
         detailed = False if raise_exception else detailed
         msgs = []
-        # perform checks for key honeybee model schema rules
+        # perform checks for duplicate identifiers
+        msgs.append(self.check_all_duplicate_identifiers(False, detailed))
+        # perform checks for specific radiance simulation rules
+        msgs.append(self.check_sensor_grid_rooms_in_model(False, detailed))
+        msgs.append(self.check_view_rooms_in_model(False, detailed))
+        # output a final report of errors or raise an exception
+        full_msgs = [msg for msg in msgs if msg]
+        if detailed:
+            return [m for msg in full_msgs for m in msg]
+        full_msg = '\n'.join(full_msgs)
+        if raise_exception and len(full_msgs) != 0:
+            raise ValueError(full_msg)
+        return full_msg
+
+    def check_all_duplicate_identifiers(self, raise_exception=True, detailed=False):
+        """Check that there are no duplicate identifiers for any radiance objects.
+
+        This includes Modifiers, ModifierSets, SensorGrids, and Views.
+
+        Args:
+            raise_exception: Boolean to note whether a ValueError should be raised
+                if any duplicate identifiers are found. If False, this method will simply
+                return a text string with all errors that were found. (Default: True).
+            detailed: Boolean for whether the returned object is a detailed list of
+                dicts with error info or a string with a message. (Default: False).
+
+        Returns:
+            A text string with all errors that were found or a list if detailed is True.
+            This string (or list) will be empty if no errors were found.
+        """
+        # set up defaults to ensure the method runs correctly
+        detailed = False if raise_exception else detailed
+        msgs = []
+        # perform checks for duplicate identifiers
         msgs.append(self.check_duplicate_modifier_identifiers(False, detailed))
         msgs.append(self.check_duplicate_modifier_set_identifiers(False, detailed))
         msgs.append(self.check_duplicate_sensor_grid_identifiers(False, detailed))
         msgs.append(self.check_duplicate_view_identifiers(False, detailed))
-        msgs.append(self.check_sensor_grid_rooms_in_model(False, detailed))
-        msgs.append(self.check_view_rooms_in_model(False, detailed))
         # output a final report of errors or raise an exception
         full_msgs = [msg for msg in msgs if msg]
         if detailed:

{honeybee_radiance-1.66.165 → honeybee_radiance-1.66.215}/honeybee_radiance/writer.py

@@ -35,7 +35,7 @@ def shade_mesh_to_rad(shade_mesh, blk=False):
     """
     rad_prop = shade_mesh.properties.radiance
     modifier = rad_prop.modifier_blk if blk else rad_prop.modifier
-    base_geo = modifier.identifier + ' polygon {} 0 0 9 {}'
+    base_geo = modifier.identifier + ' polygon {} 0 0 {} {}'
     shd_id = shade_mesh.identifier
     geo_strs = []
     str_vertices = tuple(tuple(str(v) for v in pt.to_array())
@@ -43,7 +43,7 @@ def shade_mesh_to_rad(shade_mesh, blk=False):
     for fi, f_geo in enumerate(shade_mesh.faces):
         coords = tuple(v for pt in f_geo for v in str_vertices[pt])
         poly_id = '{}_{}'.format(shd_id, fi)
-        geo_str = base_geo.format(poly_id, ' '.join(coords))
+        geo_str = base_geo.format(poly_id, len(coords), ' '.join(coords))
         geo_strs.append(geo_str)
     return '\n'.join(geo_strs)
 

{honeybee_radiance-1.66.165 → honeybee_radiance-1.66.215}/honeybee_radiance.egg-info/PKG-INFO

@@ -1,23 +1,37 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: honeybee-radiance
-Version: 1.66.165
+Version: 1.66.215
 Summary: Daylight and light simulation extension for honeybee.
 Home-page: https://github.com/ladybug-tools/honeybee-radiance
 Author: Ladybug Tools
 Author-email: info@ladybug.tools
 License: AGPL-3.0
 Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: License :: OSI Approved :: GNU Affero General Public License v3
+Classifier: Programming Language :: Python :: Implementation :: IronPython
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: honeybee-core==1.61.14
+Requires-Dist: honeybee-core==1.64.8
 Requires-Dist: honeybee-radiance-folder==2.11.16
 Requires-Dist: honeybee-radiance-command==1.22.5
 Requires-Dist: honeybee-standards==2.0.7
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 # honeybee-radiance
 

{honeybee_radiance-1.66.165 → honeybee_radiance-1.66.215}/honeybee_radiance.egg-info/SOURCES.txt

@@ -6,7 +6,6 @@ MANIFEST.in
 README.md
 dev-requirements.txt
 requirements.txt
-setup.cfg
 setup.py
 honeybee_radiance/__init__.py
 honeybee_radiance/__main__.py

{honeybee_radiance-1.66.165 → honeybee_radiance-1.66.215}/honeybee_radiance.egg-info/requires.txt

@@ -1,4 +1,4 @@
-honeybee-core==1.61.14
+honeybee-core==1.64.8
 honeybee-radiance-folder==2.11.16
 honeybee-radiance-command==1.22.5
 honeybee-standards==2.0.7

{honeybee_radiance-1.66.165 → honeybee_radiance-1.66.215}/requirements.txt

@@ -1,4 +1,4 @@
-honeybee-core==1.61.14
+honeybee-core==1.64.8
 honeybee-radiance-folder==2.11.16
 honeybee-radiance-command==1.22.5
 honeybee-standards==2.0.7

honeybee_radiance-1.66.215/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

{honeybee_radiance-1.66.165 → honeybee_radiance-1.66.215}/setup.py

@@ -25,10 +25,14 @@ setuptools.setup(
     },
     classifiers=[
         "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: Implementation :: CPython",
-        "License :: OSI Approved :: GNU Affero General Public License v3",
+        "Programming Language :: Python :: Implementation :: IronPython",
         "Operating System :: OS Independent"
     ],
     license="AGPL-3.0"

honeybee_radiance-1.66.165/setup.cfg

@@ -1,10 +0,0 @@
-[bdist_wheel]
-universal = 1
-
-[metadata]
-license_file = LICENSE
-
-[egg_info]
-tag_build = 
-tag_date = 0
-