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

HFI minimum percent conifer #4323

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

HFI minimum percent conifer #4323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f21926a
migration
brettedw Mar 6, 2025
1d9064e
pct conifer
brettedw Mar 6, 2025
6d2b7ee
tests
brettedw Mar 6, 2025
155b0cc
launcher depreciations
brettedw Mar 6, 2025
917fc01
nats and stats
brettedw Mar 6, 2025
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
59 changes: 35 additions & 24 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,41 @@
"configurations": [
{
"name": "api",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "api/app/main.py",
"console": "integratedTerminal",
"justMyCode": false
},
{
"name": "nats",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "api/app/auto_spatial_advisory/nats_consumer.py",
"console": "integratedTerminal"
},
{
"name": "sfms",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "sfms/app/main.py",
"console": "integratedTerminal"
},
{
"name": "app.jobs.noon_forecasts",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "app.jobs.noon_forecasts"
},
{
"name": "app.jobs.hourly_actuals",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "app.jobs.hourly_actuals"
},
{
"name": "app.jobs.env_canada GDPS",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "app.jobs.env_canada",
"args": [
Expand All @@ -49,7 +49,7 @@
},
{
"name": "app.jobs.env_canada RDPS",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "app.jobs.env_canada",
"args": [
Expand All @@ -58,7 +58,7 @@
},
{
"name": "app.jobs.env_canada HRDPS",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "app.jobs.env_canada",
"args": [
Expand All @@ -67,7 +67,7 @@
},
{
"name": "app.jobs.noaa GFS",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "app.jobs.noaa",
"args": [
Expand All @@ -76,7 +76,7 @@
},
{
"name": "app.jobs.noaa NAM",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "app.jobs.noaa",
"args": [
Expand All @@ -85,14 +85,14 @@
},
{
"name": "backup unit tests",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "openshift/s3-backup/docker/prune_test.py",
"console": "integratedTerminal"
},
{
"name": "asa - process hfi",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "app.auto_spatial_advisory.local.process_hfi_local",
"console": "integratedTerminal",
Expand All @@ -104,63 +104,74 @@
},
{
"name": "asa - process stats",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "app.auto_spatial_advisory.local.process_stats_local",
"console": "integratedTerminal",
"args": [
"2024-09-01T14:30:00+00:00",
"2024-09-01"
"2024-08-08T15:00:54.515870+00:00",
"2024-08-08"
]
},
{
"name": "fetch fire zones",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "app.auto_spatial_advisory.local.import_fire_zones",
"console": "integratedTerminal",
},
{
"name": "generate classified tpi",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "app.auto_spatial_advisory.local.generate_classified_tpi",
"console": "integratedTerminal",
},
{
"name": "app.jobs.rdps_sfms",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "app.jobs.rdps_sfms",
"console": "integratedTerminal"
},
{
"name": "local critical hours",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "app.auto_spatial_advisory.critical_hours",
"console": "integratedTerminal",
"args": [
"-r",
"3517"
"3460"
// "-z",
// "85"
]
},
{
"name": "local hfi wind speed",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "app.auto_spatial_advisory.hfi_minimum_wind_speed",
"console": "integratedTerminal",
"args": [
"-r",
"3517"
"3460"
]
},
{
"name": "local hfi percent conifer",
"type": "debugpy",
"request": "launch",
"module": "app.auto_spatial_advisory.hfi_percent_conifer",
"console": "integratedTerminal",
"args": [
"-r",
"3460"
]
},
{
"name": "sfms raster processor job",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "app.jobs.sfms_calculations",
"console": "integratedTerminal",
Expand All @@ -170,7 +181,7 @@
},
{
"name": "Chrome",
"type": "pwa-chrome",
"type": "chrome",
"request": "launch",
"url": "http://localhost:3000",
"webRoot": "${workspaceFolder}/web"
Expand Down
60 changes: 60 additions & 0 deletions api/alembic/versions/08799237842e_create_advisory_hfi_percent_conifer_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
"""create advisory_hfi_percent_conifer table

Revision ID: 08799237842e
Revises: 2cf10021c5f1
Create Date: 2025-03-05 14:50:47.127461

"""

from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import postgresql

# revision identifiers, used by Alembic.
revision = "08799237842e"
down_revision = "2cf10021c5f1"
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic ###

op.create_table(
"advisory_hfi_percent_conifer",
sa.Column("id", sa.Integer(), nullable=False),
sa.Column("advisory_shape_id", sa.Integer(), nullable=False),
sa.Column("fuel_type", sa.Integer(), nullable=False),
sa.Column("run_parameters", sa.Integer(), nullable=False),
sa.Column("min_percent_conifer", sa.Integer(), nullable=True),
sa.ForeignKeyConstraint(
["advisory_shape_id"],
["advisory_shapes.id"],
),
sa.ForeignKeyConstraint(
["fuel_type"],
["sfms_fuel_types.id"],
),
sa.ForeignKeyConstraint(
["run_parameters"],
["run_parameters.id"],
),
sa.PrimaryKeyConstraint("id"),
comment="Minimum percent conifer for HFI above advisory level, per fire zone. min_percent_conifer refers to the minimum percent of conifer trees in a fire zone that coincides with hfi pixels exceeding an HFI value of 4000.",
)
op.create_index(op.f("ix_advisory_hfi_percent_conifer_advisory_shape_id"), "advisory_hfi_percent_conifer", ["advisory_shape_id"], unique=False)
op.create_index(op.f("ix_advisory_hfi_percent_conifer_id"), "advisory_hfi_percent_conifer", ["id"], unique=False)
op.create_index(op.f("ix_advisory_hfi_percent_conifer_run_parameters"), "advisory_hfi_percent_conifer", ["run_parameters"], unique=False)

# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic ###

op.drop_index(op.f("ix_advisory_hfi_percent_conifer_run_parameters"), table_name="advisory_hfi_percent_conifer")
op.drop_index(op.f("ix_advisory_hfi_percent_conifer_id"), table_name="advisory_hfi_percent_conifer")
op.drop_index(op.f("ix_advisory_hfi_percent_conifer_advisory_shape_id"), table_name="advisory_hfi_percent_conifer")
op.drop_table("advisory_hfi_percent_conifer")

# ### end Alembic commands ###
Loading
Loading