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

DM-44956: Update prompt-processing notebooks for OR4 #25

Merged
merged 3 commits into from
Jun 24, 2024
Merged

DM-44956: Update prompt-processing notebooks for OR4 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
715fdd3
Use the new Embargo Rack bucket for ComCamSim data
hsinfang Jun 24, 2024
a7970a5
Increase the Loki query limit
hsinfang Jun 24, 2024
2cd175b
Fix the many-to-one merge for multiple detectors per exposure
hsinfang Jun 24, 2024
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
15 changes: 8 additions & 7 deletions prompt-processing/groups.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@
"outputs": [],
"source": [
"def get_loki_command_with_phrase(time_start, time_end, phrase, extra=f\" |~ \\\"{instrument}\\\"\"):\n",
" command = f\"\"\"/sdf/data/rubin/user/hchiang2/times_square/logcli-linux-amd64 --output=jsonl --tls-skip-verify query --addr=http://sdfloki.slac.stanford.edu:80 --timezone=UTC -q --limit=2000 --from=\"{time_start}\" --to=\"{time_end}\" --proxy-url=http://sdfproxy.sdf.slac.stanford.edu:3128 '{{namespace=\"vcluster--usdf-prompt-processing\", container=\"user-container\", pod=~\"prompt-proto-service-.+\"}} |~ \"{phrase}\" {extra} ' \"\"\"\n",
" command = f\"\"\"/sdf/data/rubin/user/hchiang2/times_square/logcli-linux-amd64 --output=jsonl --tls-skip-verify query --addr=http://sdfloki.slac.stanford.edu:80 --timezone=UTC -q --limit=10000 --from=\"{time_start}\" --to=\"{time_end}\" --proxy-url=http://sdfproxy.sdf.slac.stanford.edu:3128 '{{namespace=\"vcluster--usdf-prompt-processing\", container=\"user-container\", pod=~\"prompt-proto-service-.+\"}} |~ \"{phrase}\" {extra} ' \"\"\"\n",
" return command"
]
},
Expand Down Expand Up @@ -787,7 +787,7 @@
"outputs": [],
"source": [
"def get_loki_command_with_phrase_fanout(time_start, time_end, phrase, extra=\"\"):\n",
" command = f\"\"\"/sdf/data/rubin/user/hchiang2/times_square/logcli-linux-amd64 --output=jsonl --tls-skip-verify query --addr=http://sdfloki.slac.stanford.edu:80 --timezone=UTC -q --limit=2000 --from=\"{time_start}\" --to=\"{time_end}\" --proxy-url=http://sdfproxy.sdf.slac.stanford.edu:3128 '{{app=\"vcluster--usdf-prompt-processing\",pod=~\"next-visit-fan-out-.+\"}} |~ \"group\" |~ \"{phrase}\" {extra} ' \"\"\"\n",
" command = f\"\"\"/sdf/data/rubin/user/hchiang2/times_square/logcli-linux-amd64 --output=jsonl --tls-skip-verify query --addr=http://sdfloki.slac.stanford.edu:80 --timezone=UTC -q --limit=10000 --from=\"{time_start}\" --to=\"{time_end}\" --proxy-url=http://sdfproxy.sdf.slac.stanford.edu:3128 '{{app=\"vcluster--usdf-prompt-processing\",pod=~\"next-visit-fan-out-.+\"}} |~ \"group\" |~ \"{phrase}\" {extra} ' \"\"\"\n",
" return command"
]
},
Expand Down Expand Up @@ -945,12 +945,13 @@
"# When fan-out handles a group\n",
"df = get_df_from_loki_fanout(date, \"message deserialized\", f'|~ \"{survey}\"')\n",
"df.rename(columns={\"ts\": \"ts_fanout\"}, inplace=True)\n",
"df_loki = df_loki.merge(\n",
"df_loki = pandas.merge(\n",
" df_loki.reset_index(),\n",
" df,\n",
" on=\"groupId\",\n",
" how=\"outer\",\n",
" validate=\"one_to_one\",\n",
")"
" on=[\"groupId\"],\n",
" how=\"left\",\n",
" validate=\"many_to_one\",\n",
").set_index([\"groupId\", \"detector\"])\n"
]
},
{
Expand Down
5 changes: 4 additions & 1 deletion prompt-processing/history.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@
"metadata": {},
"outputs": [],
"source": [
"butler = Butler(\"/repo/embargo\", writeable=False)"
"if instrument == \"LATISS\":\n",
" butler = Butler(\"/repo/embargo\", writeable=False)\n",
"else:\n",
" butler = Butler(\"embargo_or4\", writeable=False)"
]
},
{
Expand Down
13 changes: 9 additions & 4 deletions prompt-processing/timing.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,10 @@
"source": [
"from lsst.daf.butler import Butler\n",
"\n",
"butler = Butler(\"/repo/embargo\", writeable=False)"
"if instrument == \"LATISS\":\n",
" butler = Butler(\"/repo/embargo\", writeable=False)\n",
"else:\n",
" butler = Butler(\"embargo_or4\", writeable=False)"
]
},
{
Expand All @@ -118,8 +121,10 @@
" timestamps : `dict` [`int`, datetime]\n",
" The keys are the exposure_id\n",
" \"\"\"\n",
"\n",
" s3_endpoint = \"https://s3dfrgw.slac.stanford.edu\"\n",
" if instrument == \"LATISS\":\n",
" s3_endpoint = \"https://s3dfrgw.slac.stanford.edu\"\n",
" else:\n",
" s3_endpoint = \"https://sdfembs3.sdf.slac.stanford.edu\"\n",
" s3client = boto3.client(\"s3\", endpoint_url=s3_endpoint)\n",
" refs = butler.registry.queryDatasets(\n",
" datasetType=datasetType,\n",
Expand All @@ -137,7 +142,7 @@
" dimension = \"exposure\"\n",
" fits_uri = butler.getURI(ref)\n",
" time_written = s3client.head_object(\n",
" Bucket=fits_uri.netloc,\n",
" Bucket=fits_uri.netloc.split(\"@\")[-1],\n",
" Key=fits_uri.relativeToPathRoot,\n",
" )[\"LastModified\"]\n",
" timestamps.append((ref.dataId[dimension], ref.dataId[\"detector\"], time_written))\n",
Expand Down
Loading