Skip to content

Commit

Permalink
fix(irradiance): Re-export annual-irradiance
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikkelkp
mikkelkp committed Nov 16, 2023
1 parent ee6e828 commit ff19ffa
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 57 deletions.
10 changes: 5 additions & 5 deletions lbt_recipes/annual_irradiance/flow/dependencies/annual_irradiance_postprocess.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
This file is auto-generated from annual-irradiance:0.4.3.
This file is auto-generated from irradiance:0.0.5.
It is unlikely that you should be editing this file directly.
Try to edit the original recipe itself and regenerate the code.
Expand Down Expand Up @@ -269,7 +269,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -349,7 +349,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -447,7 +447,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -530,7 +530,7 @@ def image_workdir(self):
return '/home/ladybugbot/run'


class _AnnualIrradiancePostprocess_f419d936Orchestrator(luigi.WrapperTask):
class _AnnualIrradiancePostprocess_5a14d535Orchestrator(luigi.WrapperTask):
"""Runs all the tasks in this module."""
# user input for this module
_input_params = luigi.DictParameter()
Expand Down
34 changes: 17 additions & 17 deletions lbt_recipes/annual_irradiance/flow/dependencies/annual_irradiance_prepare_folder.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
This file is auto-generated from annual-irradiance:0.4.3.
This file is auto-generated from irradiance:0.0.5.
It is unlikely that you should be editing this file directly.
Try to edit the original recipe itself and regenerate the code.
Expand Down Expand Up @@ -88,7 +88,7 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance sky mtx sky.wea --name sky --north {north} --sky-type {sky_type} --{cumulative} --{sun_up_hours} --{output_type} --output-format {output_format} --sky-density {sky_density}'.format(sky_type=self.sky_type, sky_density=self.sky_density, north=self.north, output_format=self.output_format, sun_up_hours=self.sun_up_hours, output_type=self.output_type, cumulative=self.cumulative)
return 'honeybee-radiance sky mtx sky.wea --name sky --north {north} --sky-type {sky_type} --{cumulative} --{sun_up_hours} --{output_type} --output-format {output_format} --sky-density {sky_density}'.format(cumulative=self.cumulative, sky_density=self.sky_density, output_type=self.output_type, sun_up_hours=self.sun_up_hours, north=self.north, sky_type=self.sky_type, output_format=self.output_format)

def output(self):
return {
Expand Down Expand Up @@ -125,7 +125,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -213,7 +213,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -277,7 +277,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -341,7 +341,7 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance sky mtx sky.wea --name sky --north {north} --sky-type {sky_type} --{cumulative} --{sun_up_hours} --{output_type} --output-format {output_format} --sky-density {sky_density}'.format(sky_type=self.sky_type, sky_density=self.sky_density, north=self.north, output_format=self.output_format, sun_up_hours=self.sun_up_hours, output_type=self.output_type, cumulative=self.cumulative)
return 'honeybee-radiance sky mtx sky.wea --name sky --north {north} --sky-type {sky_type} --{cumulative} --{sun_up_hours} --{output_type} --output-format {output_format} --sky-density {sky_density}'.format(cumulative=self.cumulative, sky_density=self.sky_density, output_type=self.output_type, sun_up_hours=self.sun_up_hours, north=self.north, sky_type=self.sky_type, output_format=self.output_format)

def output(self):
return {
Expand Down Expand Up @@ -378,7 +378,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -428,7 +428,7 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance sunpath radiance sky.wea --name sunpath --{output_type} --north {north}'.format(north=self.north, output_type=self.output_type)
return 'honeybee-radiance sunpath radiance sky.wea --name sunpath --{output_type} --north {north}'.format(output_type=self.output_type, north=self.north)

def output(self):
return {
Expand Down Expand Up @@ -471,7 +471,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -517,7 +517,7 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance octree from-folder model --output scene.oct --{include_aperture}-aperture --{black_out}'.format(include_aperture=self.include_aperture, black_out=self.black_out)
return 'honeybee-radiance octree from-folder model --output scene.oct --{include_aperture}-aperture --{black_out}'.format(black_out=self.black_out, include_aperture=self.include_aperture)

def requires(self):
return {'CreateRadFolder': CreateRadFolder(_input_params=self._input_params)}
Expand Down Expand Up @@ -552,7 +552,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -604,7 +604,7 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance octree from-folder model --output scene.oct --{include_aperture}-aperture --{black_out} --add-before sky.sky'.format(include_aperture=self.include_aperture, black_out=self.black_out)
return 'honeybee-radiance octree from-folder model --output scene.oct --{include_aperture}-aperture --{black_out} --add-before sky.sky'.format(black_out=self.black_out, include_aperture=self.include_aperture)

def requires(self):
return {'GenerateSunpath': GenerateSunpath(_input_params=self._input_params), 'CreateRadFolder': CreateRadFolder(_input_params=self._input_params)}
Expand Down Expand Up @@ -640,7 +640,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -716,7 +716,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -775,7 +775,7 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance grid split-folder ./input_folder ./output_folder {cpu_count} --grid-divisor {cpus_per_grid} --min-sensor-count {min_sensor_count}'.format(cpu_count=self.cpu_count, cpus_per_grid=self.cpus_per_grid, min_sensor_count=self.min_sensor_count)
return 'honeybee-radiance grid split-folder ./input_folder ./output_folder {cpu_count} --grid-divisor {cpus_per_grid} --min-sensor-count {min_sensor_count}'.format(min_sensor_count=self.min_sensor_count, cpu_count=self.cpu_count, cpus_per_grid=self.cpus_per_grid)

def requires(self):
return {'CreateRadFolder': CreateRadFolder(_input_params=self._input_params)}
Expand Down Expand Up @@ -822,7 +822,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -905,7 +905,7 @@ def image_workdir(self):
return '/home/ladybugbot/run'


class _AnnualIrradiancePrepareFolder_f419d936Orchestrator(luigi.WrapperTask):
class _AnnualIrradiancePrepareFolder_5a14d535Orchestrator(luigi.WrapperTask):
"""Runs all the tasks in this module."""
# user input for this module
_input_params = luigi.DictParameter()
Expand Down
18 changes: 9 additions & 9 deletions lbt_recipes/annual_irradiance/flow/dependencies/annual_irradiance_ray_tracing.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
This file is auto-generated from annual-irradiance:0.4.3.
This file is auto-generated from irradiance:0.0.5.
It is unlikely that you should be editing this file directly.
Try to edit the original recipe itself and regenerate the code.
Expand Down Expand Up @@ -120,7 +120,7 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(radiance_parameters=self.radiance_parameters, header=self.header, conversion=self.conversion, order_by=self.order_by, sensor_count=self.sensor_count, output_format=self.output_format, fixed_radiance_parameters=self.fixed_radiance_parameters)
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(header=self.header, conversion=self.conversion, fixed_radiance_parameters=self.fixed_radiance_parameters, order_by=self.order_by, radiance_parameters=self.radiance_parameters, sensor_count=self.sensor_count, output_format=self.output_format)

def output(self):
return {
Expand Down Expand Up @@ -161,7 +161,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -253,7 +253,7 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance dc scontrib scene.oct grid.pts suns.mod --{calculate_values} --sensor-count {sensor_count} --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --output results.ill --order-by-{order_by} --{header}-header'.format(radiance_parameters=self.radiance_parameters, header=self.header, conversion=self.conversion, order_by=self.order_by, sensor_count=self.sensor_count, output_format=self.output_format, calculate_values=self.calculate_values, fixed_radiance_parameters=self.fixed_radiance_parameters)
return 'honeybee-radiance dc scontrib scene.oct grid.pts suns.mod --{calculate_values} --sensor-count {sensor_count} --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --output results.ill --order-by-{order_by} --{header}-header'.format(header=self.header, conversion=self.conversion, fixed_radiance_parameters=self.fixed_radiance_parameters, order_by=self.order_by, radiance_parameters=self.radiance_parameters, calculate_values=self.calculate_values, sensor_count=self.sensor_count, output_format=self.output_format)

def output(self):
return {
Expand Down Expand Up @@ -294,7 +294,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -387,7 +387,7 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(radiance_parameters=self.radiance_parameters, header=self.header, conversion=self.conversion, order_by=self.order_by, sensor_count=self.sensor_count, output_format=self.output_format, fixed_radiance_parameters=self.fixed_radiance_parameters)
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(header=self.header, conversion=self.conversion, fixed_radiance_parameters=self.fixed_radiance_parameters, order_by=self.order_by, radiance_parameters=self.radiance_parameters, sensor_count=self.sensor_count, output_format=self.output_format)

def output(self):
return {
Expand Down Expand Up @@ -428,7 +428,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -611,14 +611,14 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.47'

@property
def image_workdir(self):
return '/home/ladybugbot/run'


class _AnnualIrradianceRayTracing_f419d936Orchestrator(luigi.WrapperTask):
class _AnnualIrradianceRayTracing_5a14d535Orchestrator(luigi.WrapperTask):
"""Runs all the tasks in this module."""
# user input for this module
_input_params = luigi.DictParameter()
Expand Down
21 changes: 12 additions & 9 deletions ...s/annual_irradiance/flow/main_f419d936.py → ...s/annual_irradiance/flow/main_5a14d535.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
This file is auto-generated from annual-irradiance:0.4.3.
This file is auto-generated from irradiance:0.0.5.
It is unlikely that you should be editing this file directly.
Try to edit the original recipe itself and regenerate the code.
Expand All @@ -17,9 +17,9 @@
from queenbee_local import QueenbeeTask
from queenbee_local import load_input_param as qb_load_input_param
from . import _queenbee_status_lock_
from .dependencies.annual_irradiance_ray_tracing import _AnnualIrradianceRayTracing_f419d936Orchestrator as AnnualIrradianceRayTracing_f419d936Workerbee
from .dependencies.annual_irradiance_postprocess import _AnnualIrradiancePostprocess_f419d936Orchestrator as AnnualIrradiancePostprocess_f419d936Workerbee
from .dependencies.annual_irradiance_prepare_folder import _AnnualIrradiancePrepareFolder_f419d936Orchestrator as AnnualIrradiancePrepareFolder_f419d936Workerbee
from .dependencies.annual_irradiance_ray_tracing import _AnnualIrradianceRayTracing_5a14d535Orchestrator as AnnualIrradianceRayTracing_5a14d535Workerbee
from .dependencies.annual_irradiance_postprocess import _AnnualIrradiancePostprocess_5a14d535Orchestrator as AnnualIrradiancePostprocess_5a14d535Workerbee
from .dependencies.annual_irradiance_prepare_folder import _AnnualIrradiancePrepareFolder_5a14d535Orchestrator as AnnualIrradiancePrepareFolder_5a14d535Workerbee


_default_inputs = { 'cpu_count': 50,
Expand Down Expand Up @@ -114,7 +114,7 @@ def map_dag_inputs(self):
return inputs

def run(self):
yield [AnnualIrradiancePrepareFolder_f419d936Workerbee(_input_params=self.map_dag_inputs)]
yield [AnnualIrradiancePrepareFolder_5a14d535Workerbee(_input_params=self.map_dag_inputs)]
pathlib.Path(self.execution_folder).mkdir(parents=True, exist_ok=True)
self._copy_output_artifacts(self.execution_folder)
self._copy_output_parameters(self.execution_folder)
Expand Down Expand Up @@ -288,7 +288,7 @@ def map_dag_inputs(self):
return inputs

def run(self):
yield [AnnualIrradianceRayTracing_f419d936Workerbee(_input_params=self.map_dag_inputs)]
yield [AnnualIrradianceRayTracing_5a14d535Workerbee(_input_params=self.map_dag_inputs)]
done_file = pathlib.Path(self.execution_folder, 'annual_irradiance_raytracing.done')
done_file.parent.mkdir(parents=True, exist_ok=True)
done_file.write_text('done!')
Expand Down Expand Up @@ -356,7 +356,9 @@ class PostprocessAnnualIrradiance(QueenbeeTask):
_status_lock = _queenbee_status_lock_

# Task inputs
timestep = luigi.Parameter(default='1')
@property
def timestep(self):
return self._input_params['timestep']

@property
def input_folder(self):
Expand Down Expand Up @@ -402,6 +404,7 @@ def map_dag_inputs(self):
'input_folder': self.input_folder,
'grids_info': self.grids_info,
'sun_up_hours': self.sun_up_hours,
'timestep': self.timestep,
'wea': self.wea
}
try:
Expand All @@ -413,7 +416,7 @@ def map_dag_inputs(self):
return inputs

def run(self):
yield [AnnualIrradiancePostprocess_f419d936Workerbee(_input_params=self.map_dag_inputs)]
yield [AnnualIrradiancePostprocess_5a14d535Workerbee(_input_params=self.map_dag_inputs)]
pathlib.Path(self.execution_folder).mkdir(parents=True, exist_ok=True)
self._copy_output_artifacts(self.execution_folder)
self._copy_output_parameters(self.execution_folder)
Expand Down Expand Up @@ -452,7 +455,7 @@ def output_artifacts(self):
}]


class _Main_f419d936Orchestrator(luigi.WrapperTask):
class _Main_5a14d535Orchestrator(luigi.WrapperTask):
"""Runs all the tasks in this module."""
# user input for this module
_input_params = luigi.DictParameter()
Expand Down
6 changes: 3 additions & 3 deletions lbt_recipes/annual_irradiance/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"type": "MetaData",
"annotations": {},
"name": "annual-irradiance",
"tag": "0.4.3",
"name": "irradiance",
"tag": "0.0.5",
"app_version": null,
"keywords": [
"honeybee",
Expand All @@ -29,7 +29,7 @@
"email": "[email protected]"
}
],
"home": "https://github.com/pollination/annual-irradiance",
"home": "https://github.com/pollination/irradiance",
"sources": [
"https://hub.docker.com/r/ladybugtools/honeybee-radiance"
],
Expand Down
Loading

0 comments on commit ff19ffa

Please sign in to comment.