Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(deps): Trigger new release with updated deps #456

Merged
merged 1 commit into from
Aug 18, 2023
Merged

fix(deps): Trigger new release with updated deps #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
154 changes: 149 additions & 5 deletions lbt_recipes/daylight_factor/flow/dependencies/daylight_factor_post_process_results.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
This file is auto-generated from daylight-factor:0.8.8.
This file is auto-generated from daylight-factor:0.8.12.
It is unlikely that you should be editing this file directly.
Try to edit the original recipe itself and regenerate the code.

Expand All @@ -19,7 +19,9 @@
from . import _queenbee_status_lock_


_default_inputs = { 'grids_info': None,
_default_inputs = { 'grid_metrics': None,
'grids_info': None,
'model': None,
'params_folder': '__params',
'results_folder': None,
'simulation_folder': '.'}
Expand Down Expand Up @@ -55,6 +57,14 @@ def initiation_folder(self):
def params_folder(self):
return pathlib.Path(self.execution_folder, self._input_params['params_folder']).resolve().as_posix()

@property
def __script__(self):
return pathlib.Path(__file__).parent.joinpath('scripts', 'restructure_results.py').resolve()

@property
def is_script(self):
return False

def command(self):
return 'honeybee-radiance grid merge-folder ./input_folder ./output_folder {extension} --dist-info dist_info.json'.format(extension=self.extension)

Expand All @@ -80,9 +90,14 @@ def output_artifacts(self):
'type': 'folder'
}]

@property
def input_parameters(self):
return {
'extension': self.extension}

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

@property
def image_workdir(self):
Expand Down Expand Up @@ -115,6 +130,14 @@ def initiation_folder(self):
def params_folder(self):
return pathlib.Path(self.execution_folder, self._input_params['params_folder']).resolve().as_posix()

@property
def __script__(self):
return pathlib.Path(__file__).parent.joinpath('scripts', 'copy_grid_info.py').resolve()

@property
def is_script(self):
return False

def command(self):
return 'echo copying input file...'

Expand Down Expand Up @@ -143,6 +166,11 @@ def output_artifacts(self):
'type': 'file'
}]

@property
def input_parameters(self):
return {
}

@property
def task_image(self):
return 'docker.io/python:3.7-slim'
Expand All @@ -152,7 +180,123 @@ def image_workdir(self):
return '/home/ladybugbot/run'


class _DaylightFactorPostProcessResults_afc7c61dOrchestrator(luigi.WrapperTask):
class GridSummaryMetrics(QueenbeeTask):
"""Calculate grid summary for metrics."""

# DAG Input parameters
_input_params = luigi.DictParameter()
_status_lock = _queenbee_status_lock_

# Task inputs
@property
def folder_level(self):
return 'main-folder'

@property
def folder(self):
value = pathlib.Path(self.input()['RestructureResults']['output_folder'].path)
return value.as_posix() if value.is_absolute() \
else pathlib.Path(self.initiation_folder, value).resolve().as_posix()

@property
def model(self):
try:
pathlib.Path(self._input_params['model'])
except TypeError:
# optional artifact
return None
value = pathlib.Path(self._input_params['model'])
return value.as_posix() if value.is_absolute() \
else pathlib.Path(self.initiation_folder, value).resolve().as_posix()

@property
def grids_info(self):
try:
pathlib.Path(self._input_params['grids_info'])
except TypeError:
# optional artifact
return None
value = pathlib.Path(self._input_params['grids_info'])
return value.as_posix() if value.is_absolute() \
else pathlib.Path(self.initiation_folder, value).resolve().as_posix()

@property
def grid_metrics(self):
try:
pathlib.Path(self._input_params['grid_metrics'])
except TypeError:
# optional artifact
return None
value = pathlib.Path(self._input_params['grid_metrics'])
return value.as_posix() if value.is_absolute() \
else pathlib.Path(self.initiation_folder, value).resolve().as_posix()

@property
def execution_folder(self):
return pathlib.Path(self._input_params['simulation_folder']).as_posix()

@property
def initiation_folder(self):
return pathlib.Path(self._input_params['simulation_folder']).as_posix()

@property
def params_folder(self):
return pathlib.Path(self.execution_folder, self._input_params['params_folder']).resolve().as_posix()

@property
def __script__(self):
return pathlib.Path(__file__).parent.joinpath('scripts', 'grid_summary_metrics.py').resolve()

@property
def is_script(self):
return False

def command(self):
return 'honeybee-radiance-postprocess post-process grid-summary metrics --model model.hbjson --grids-info grids_info.json --grid-metrics grid_metrics.json --{folder_level}'.format(folder_level=self.folder_level)

def requires(self):
return {'RestructureResults': RestructureResults(_input_params=self._input_params)}

def output(self):
return {
'grid_summary': luigi.LocalTarget(
pathlib.Path(self.execution_folder, 'grid_summary.csv').resolve().as_posix()
)
}

@property
def input_artifacts(self):
return [
{'name': 'folder', 'to': 'metrics', 'from': self.folder, 'optional': False},
{'name': 'model', 'to': 'model.hbjson', 'from': self.model, 'optional': True},
{'name': 'grids_info', 'to': 'grids_info.json', 'from': self.grids_info, 'optional': True},
{'name': 'grid_metrics', 'to': 'grid_metrics.json', 'from': self.grid_metrics, 'optional': True}]

@property
def output_artifacts(self):
return [
{
'name': 'grid-summary', 'from': 'metrics/grid_summary.csv',
'to': pathlib.Path(self.execution_folder, 'grid_summary.csv').resolve().as_posix(),
'optional': False,
'type': 'file'
}]

@property
def input_parameters(self):
return {
'folder_level': self.folder_level}

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

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


class _DaylightFactorPostProcessResults_0d7cfa1eOrchestrator(luigi.WrapperTask):
"""Runs all the tasks in this module."""
# user input for this module
_input_params = luigi.DictParameter()
Expand All @@ -164,4 +308,4 @@ def input_values(self):
return params

def requires(self):
yield [CopyGridInfo(_input_params=self.input_values)]
yield [CopyGridInfo(_input_params=self.input_values), GridSummaryMetrics(_input_params=self.input_values)]
77 changes: 67 additions & 10 deletions lbt_recipes/daylight_factor/flow/dependencies/daylight_factor_prepare_folder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
This file is auto-generated from daylight-factor:0.8.8.
This file is auto-generated from daylight-factor:0.8.12.
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 @@ -57,6 +57,14 @@ def initiation_folder(self):
def params_folder(self):
return pathlib.Path(self.execution_folder, self._input_params['params_folder']).resolve().as_posix()

@property
def __script__(self):
return pathlib.Path(__file__).parent.joinpath('scripts', 'create_rad_folder.py').resolve()

@property
def is_script(self):
return False

def command(self):
return 'honeybee-radiance translate model-to-rad-folder model.hbjson --grid "{grid_filter}" --grid-check'.format(grid_filter=self.grid_filter)

Expand Down Expand Up @@ -93,9 +101,14 @@ def output_artifacts(self):
'type': 'file'
}]

@property
def input_parameters(self):
return {
'grid_filter': self.grid_filter}

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

@property
def image_workdir(self):
Expand Down Expand Up @@ -128,8 +141,16 @@ def initiation_folder(self):
def params_folder(self):
return pathlib.Path(self.execution_folder, self._input_params['params_folder']).resolve().as_posix()

@property
def __script__(self):
return pathlib.Path(__file__).parent.joinpath('scripts', 'generate_sky.py').resolve()

@property
def is_script(self):
return False

def command(self):
return 'honeybee-radiance sky illuminance {illuminance} --ground {ground_reflectance} --{uniform} --name output.sky'.format(uniform=self.uniform, illuminance=self.illuminance, ground_reflectance=self.ground_reflectance)
return 'honeybee-radiance sky illuminance {illuminance} --ground {ground_reflectance} --{uniform} --name output.sky'.format(ground_reflectance=self.ground_reflectance, uniform=self.uniform, illuminance=self.illuminance)

def output(self):
return {
Expand All @@ -148,9 +169,16 @@ def output_artifacts(self):
'type': 'file'
}]

@property
def input_parameters(self):
return {
'ground_reflectance': self.ground_reflectance,
'illuminance': self.illuminance,
'uniform': self.uniform}

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

@property
def image_workdir(self):
Expand Down Expand Up @@ -193,8 +221,16 @@ def initiation_folder(self):
def params_folder(self):
return pathlib.Path(self.execution_folder, self._input_params['params_folder']).resolve().as_posix()

@property
def __script__(self):
return pathlib.Path(__file__).parent.joinpath('scripts', 'create_octree.py').resolve()

@property
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 {'GenerateSky': GenerateSky(_input_params=self._input_params), 'CreateRadFolder': CreateRadFolder(_input_params=self._input_params)}
Expand Down Expand Up @@ -222,9 +258,15 @@ def output_artifacts(self):
'type': 'file'
}]

@property
def input_parameters(self):
return {
'black_out': self.black_out,
'include_aperture': self.include_aperture}

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

@property
def image_workdir(self):
Expand All @@ -250,7 +292,7 @@ def cpu_count(self):

@property
def cpus_per_grid(self):
return '3'
return '1'

@property
def min_sensor_count(self):
Expand All @@ -274,8 +316,16 @@ def initiation_folder(self):
def params_folder(self):
return pathlib.Path(self.execution_folder, self._input_params['params_folder']).resolve().as_posix()

@property
def __script__(self):
return pathlib.Path(__file__).parent.joinpath('scripts', 'split_grid_folder.py').resolve()

@property
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(min_sensor_count=self.min_sensor_count, cpus_per_grid=self.cpus_per_grid, cpu_count=self.cpu_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 @@ -313,16 +363,23 @@ def output_artifacts(self):
'type': 'file'
}]

@property
def input_parameters(self):
return {
'cpu_count': self.cpu_count,
'cpus_per_grid': self.cpus_per_grid,
'min_sensor_count': self.min_sensor_count}

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

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


class _DaylightFactorPrepareFolder_afc7c61dOrchestrator(luigi.WrapperTask):
class _DaylightFactorPrepareFolder_0d7cfa1eOrchestrator(luigi.WrapperTask):
"""Runs all the tasks in this module."""
# user input for this module
_input_params = luigi.DictParameter()
Expand Down
Loading
Loading