Skip to content

Commit

Permalink
Update schema yaml files
Browse files Browse the repository at this point in the history
  • Loading branch information
rcboufleur committed Jan 27, 2025
1 parent 855390b commit 5d2cfc7
Show file tree
Hide file tree
Showing 17 changed files with 37 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2832,7 +2832,7 @@ tables:
- name: timewindow
"@id": "#transformed_efd_scheduler.timewindow"
datatype: int
description: Time window used to expand start and end times by, in minutes
description: Time window used to expand start and endtimes by, in minutes
- name: status
"@id": "#transformed_efd_scheduler.status"
datatype: char
Expand Down Expand Up @@ -2871,6 +2871,9 @@ tables:
"@id": "#transformed_efd_scheduler.error"
datatype: text
description: "Error message, if any"
- name: butler_repo
"@id": "#transformed_efd_scheduler.butler_repo"
datatype: text
- name: created_at
"@id": "#transformed_efd_scheduler.created_at"
datatype: timestamp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4537,7 +4537,7 @@ tables:
- name: timewindow
"@id": "#transformed_efd_scheduler.timewindow"
datatype: int
description: Time window used to expand start and end times by, in minutes
description: Time window used to expand start and endtimes by, in minutes
- name: status
"@id": "#transformed_efd_scheduler.status"
datatype: char
Expand Down Expand Up @@ -4576,6 +4576,9 @@ tables:
"@id": "#transformed_efd_scheduler.error"
datatype: text
description: "Error message, if any"
- name: butler_repo
"@id": "#transformed_efd_scheduler.butler_repo"
datatype: text
- name: created_at
"@id": "#transformed_efd_scheduler.created_at"
datatype: timestamp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4537,7 +4537,7 @@ tables:
- name: timewindow
"@id": "#transformed_efd_scheduler.timewindow"
datatype: int
description: Time window used to expand start and end times by, in minutes
description: Time window used to expand start and endtimes by, in minutes
- name: status
"@id": "#transformed_efd_scheduler.status"
datatype: char
Expand Down Expand Up @@ -4576,6 +4576,9 @@ tables:
"@id": "#transformed_efd_scheduler.error"
datatype: text
description: "Error message, if any"
- name: butler_repo
"@id": "#transformed_efd_scheduler.butler_repo"
datatype: text
- name: created_at
"@id": "#transformed_efd_scheduler.created_at"
datatype: timestamp
Expand Down
Empty file removed tests/efd_transform/LATISS.db
Empty file.
3 changes: 2 additions & 1 deletion tmp/efd_transform/LATISS-pg.sql
Original file line number Diff line number Diff line change
Expand Up @@ -1138,6 +1138,7 @@ CREATE TABLE cdb_latiss.transformed_efd_scheduler (
visits1 INTEGER DEFAULT 0,
retries INTEGER DEFAULT 0,
error TEXT,
butler_repo TEXT,
created_at TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (id),
CONSTRAINT un_id UNIQUE (id)
Expand All @@ -1148,7 +1149,7 @@ COMMENT ON TABLE cdb_latiss.transformed_efd_scheduler IS 'Transformed EFD schedu
COMMENT ON COLUMN cdb_latiss.transformed_efd_scheduler.id IS 'Unique ID, auto-incremented';
COMMENT ON COLUMN cdb_latiss.transformed_efd_scheduler.start_time IS 'Start time of the transformation interval, must be provided';
COMMENT ON COLUMN cdb_latiss.transformed_efd_scheduler.end_time IS 'End time of the transformation interval, must be provided';
COMMENT ON COLUMN cdb_latiss.transformed_efd_scheduler.timewindow IS 'Time window used to expand start and end times by, in minutes';
COMMENT ON COLUMN cdb_latiss.transformed_efd_scheduler.timewindow IS 'Time window used to expand start and endtimes by, in minutes';
COMMENT ON COLUMN cdb_latiss.transformed_efd_scheduler.status IS 'Status of the process, default is ''pending''';
COMMENT ON COLUMN cdb_latiss.transformed_efd_scheduler.process_start_time IS 'Timestamp when the process started';
COMMENT ON COLUMN cdb_latiss.transformed_efd_scheduler.process_end_time IS 'Timestamp when the process ended';
Expand Down
1 change: 1 addition & 0 deletions tmp/efd_transform/LATISS-sqlite.sql
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,7 @@ CREATE TABLE main.transformed_efd_scheduler (
visits1 INTEGER DEFAULT 0,
retries INTEGER DEFAULT 0,
error TEXT,
butler_repo TEXT,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (id),
CONSTRAINT un_id UNIQUE (id)
Expand Down
Binary file modified tmp/efd_transform/LATISS.db
Binary file not shown.
3 changes: 2 additions & 1 deletion tmp/efd_transform/LSSTComCam-pg.sql
Original file line number Diff line number Diff line change
Expand Up @@ -1820,6 +1820,7 @@ CREATE TABLE cdb_lsstcomcam.transformed_efd_scheduler (
visits1 INTEGER DEFAULT 0,
retries INTEGER DEFAULT 0,
error TEXT,
butler_repo TEXT,
created_at TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (id),
CONSTRAINT un_id UNIQUE (id)
Expand All @@ -1830,7 +1831,7 @@ COMMENT ON TABLE cdb_lsstcomcam.transformed_efd_scheduler IS 'Transformed EFD sc
COMMENT ON COLUMN cdb_lsstcomcam.transformed_efd_scheduler.id IS 'Unique ID, auto-incremented';
COMMENT ON COLUMN cdb_lsstcomcam.transformed_efd_scheduler.start_time IS 'Start time of the transformation interval, must be provided';
COMMENT ON COLUMN cdb_lsstcomcam.transformed_efd_scheduler.end_time IS 'End time of the transformation interval, must be provided';
COMMENT ON COLUMN cdb_lsstcomcam.transformed_efd_scheduler.timewindow IS 'Time window used to expand start and end times by, in minutes';
COMMENT ON COLUMN cdb_lsstcomcam.transformed_efd_scheduler.timewindow IS 'Time window used to expand start and endtimes by, in minutes';
COMMENT ON COLUMN cdb_lsstcomcam.transformed_efd_scheduler.status IS 'Status of the process, default is ''pending''';
COMMENT ON COLUMN cdb_lsstcomcam.transformed_efd_scheduler.process_start_time IS 'Timestamp when the process started';
COMMENT ON COLUMN cdb_lsstcomcam.transformed_efd_scheduler.process_end_time IS 'Timestamp when the process ended';
Expand Down
1 change: 1 addition & 0 deletions tmp/efd_transform/LSSTComCam-sqlite.sql
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,7 @@ CREATE TABLE main.transformed_efd_scheduler (
visits1 INTEGER DEFAULT 0,
retries INTEGER DEFAULT 0,
error TEXT,
butler_repo TEXT,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (id),
CONSTRAINT un_id UNIQUE (id)
Expand Down
Binary file modified tmp/efd_transform/LSSTComCam.db
Binary file not shown.
3 changes: 2 additions & 1 deletion tmp/efd_transform/LSSTComCamSim-pg.sql
Original file line number Diff line number Diff line change
Expand Up @@ -1820,6 +1820,7 @@ CREATE TABLE cdb_lsstcomcamsim.transformed_efd_scheduler (
visits1 INTEGER DEFAULT 0,
retries INTEGER DEFAULT 0,
error TEXT,
butler_repo TEXT,
created_at TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (id),
CONSTRAINT un_id UNIQUE (id)
Expand All @@ -1830,7 +1831,7 @@ COMMENT ON TABLE cdb_lsstcomcamsim.transformed_efd_scheduler IS 'Transformed EFD
COMMENT ON COLUMN cdb_lsstcomcamsim.transformed_efd_scheduler.id IS 'Unique ID, auto-incremented';
COMMENT ON COLUMN cdb_lsstcomcamsim.transformed_efd_scheduler.start_time IS 'Start time of the transformation interval, must be provided';
COMMENT ON COLUMN cdb_lsstcomcamsim.transformed_efd_scheduler.end_time IS 'End time of the transformation interval, must be provided';
COMMENT ON COLUMN cdb_lsstcomcamsim.transformed_efd_scheduler.timewindow IS 'Time window used to expand start and end times by, in minutes';
COMMENT ON COLUMN cdb_lsstcomcamsim.transformed_efd_scheduler.timewindow IS 'Time window used to expand start and endtimes by, in minutes';
COMMENT ON COLUMN cdb_lsstcomcamsim.transformed_efd_scheduler.status IS 'Status of the process, default is ''pending''';
COMMENT ON COLUMN cdb_lsstcomcamsim.transformed_efd_scheduler.process_start_time IS 'Timestamp when the process started';
COMMENT ON COLUMN cdb_lsstcomcamsim.transformed_efd_scheduler.process_end_time IS 'Timestamp when the process ended';
Expand Down
1 change: 1 addition & 0 deletions tmp/efd_transform/LSSTComCamSim-sqlite.sql
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,7 @@ CREATE TABLE main.transformed_efd_scheduler (
visits1 INTEGER DEFAULT 0,
retries INTEGER DEFAULT 0,
error TEXT,
butler_repo TEXT,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (id),
CONSTRAINT un_id UNIQUE (id)
Expand Down
Binary file modified tmp/efd_transform/LSSTComCamSim.db
Binary file not shown.
5 changes: 4 additions & 1 deletion tmp/efd_transform/cdb_transformed_efd_LATISS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2832,7 +2832,7 @@ tables:
- name: timewindow
"@id": "#transformed_efd_scheduler.timewindow"
datatype: int
description: Time window used to expand start and end times by, in minutes
description: Time window used to expand start and endtimes by, in minutes
- name: status
"@id": "#transformed_efd_scheduler.status"
datatype: char
Expand Down Expand Up @@ -2871,6 +2871,9 @@ tables:
"@id": "#transformed_efd_scheduler.error"
datatype: text
description: "Error message, if any"
- name: butler_repo
"@id": "#transformed_efd_scheduler.butler_repo"
datatype: text
- name: created_at
"@id": "#transformed_efd_scheduler.created_at"
datatype: timestamp
Expand Down
5 changes: 4 additions & 1 deletion tmp/efd_transform/cdb_transformed_efd_LSSTComCam.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4537,7 +4537,7 @@ tables:
- name: timewindow
"@id": "#transformed_efd_scheduler.timewindow"
datatype: int
description: Time window used to expand start and end times by, in minutes
description: Time window used to expand start and endtimes by, in minutes
- name: status
"@id": "#transformed_efd_scheduler.status"
datatype: char
Expand Down Expand Up @@ -4576,6 +4576,9 @@ tables:
"@id": "#transformed_efd_scheduler.error"
datatype: text
description: "Error message, if any"
- name: butler_repo
"@id": "#transformed_efd_scheduler.butler_repo"
datatype: text
- name: created_at
"@id": "#transformed_efd_scheduler.created_at"
datatype: timestamp
Expand Down
5 changes: 4 additions & 1 deletion tmp/efd_transform/cdb_transformed_efd_LSSTComCamSim.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4537,7 +4537,7 @@ tables:
- name: timewindow
"@id": "#transformed_efd_scheduler.timewindow"
datatype: int
description: Time window used to expand start and end times by, in minutes
description: Time window used to expand start and endtimes by, in minutes
- name: status
"@id": "#transformed_efd_scheduler.status"
datatype: char
Expand Down Expand Up @@ -4576,6 +4576,9 @@ tables:
"@id": "#transformed_efd_scheduler.error"
datatype: text
description: "Error message, if any"
- name: butler_repo
"@id": "#transformed_efd_scheduler.butler_repo"
datatype: text
- name: created_at
"@id": "#transformed_efd_scheduler.created_at"
datatype: timestamp
Expand Down
7 changes: 4 additions & 3 deletions tmp/efd_transform/run_transform_efd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,15 @@
python python/lsst/consdb/efd_transform/transform_efd.py \
-i LATISS \
-s 2024-09-30T18:00:00 \
-e 2024-10-03T19:00:00 \
-e 2024-09-30T19:30:00 \
-r /repo/embargo_old \
-d sqlite:///$PWD/tmp/efd_transform/LATISS.db \
-E usdf_efd \
-c python/lsst/consdb/efd_transform/config_LATISS.yaml \
-t 60 \
-t 30 \
-w 1 \
-l $PWD/tmp/transform.log
-l $PWD/tmp/transform.log \
-m job \


# python python/lsst/consdb/efd_transform/transform_efd.py \
Expand Down

0 comments on commit 5d2cfc7

Please sign in to comment.