hydroserver2 · kjlippold · Sep 24, 2026 · Sep 24, 2026 · Sep 24, 2026 · Sep 24, 2026
diff --git a/apps/data-management/e2e/specs/sites.spec.ts b/apps/data-management/e2e/specs/sites.spec.ts
@@ -309,7 +309,7 @@ test.describe('sites and workspaces', () => {
   test('Browse metadata controls stay on one line with multiple values', async ({
     page,
   }) => {
-    await page.route('**/api/data/monitoring-sites/site-summaries*', async (route) => {
+    await page.route('**/api/ogc/collections/monitoring-sites/site-summaries*', async (route) => {
       const response = await route.fetch()
       const summaries = (await response.json()) as Array<{
         tags: Record<string, string>
@@ -629,7 +629,7 @@ test.describe('sites and workspaces', () => {
     await expect
       .poll(async () => {
         const response = await page.request.get(
-          `${apiBaseUrl}/api/data/monitoring-sites/${fixtures.monitoringSites.public.id}`
+          `${apiBaseUrl}/api/ogc/collections/monitoring-sites/items/${fixtures.monitoringSites.public.id}`
         )
         const monitoringSite = await response.json()
         return monitoringSite.data.isPrivate
@@ -638,7 +638,7 @@ test.describe('sites and workspaces', () => {
     await page.getByRole('button', { name: 'Close' }).click()
 
     const blockedMonitoringSiteRequest = anonymousPage.waitForResponse((response) =>
-      response.url().includes(`/api/data/monitoring-sites/${fixtures.monitoringSites.public.id}`)
+      response.url().includes(`/api/ogc/collections/monitoring-sites/items/${fixtures.monitoringSites.public.id}`)
     )
     await anonymousPage.goto(`/sites/${fixtures.monitoringSites.public.id}`)
     const blockedMonitoringSiteResponse = await blockedMonitoringSiteRequest
@@ -650,7 +650,7 @@ test.describe('sites and workspaces', () => {
     await expect
       .poll(async () => {
         const response = await page.request.get(
-          `${apiBaseUrl}/api/data/monitoring-sites/${fixtures.monitoringSites.public.id}`
+          `${apiBaseUrl}/api/ogc/collections/monitoring-sites/items/${fixtures.monitoringSites.public.id}`
         )
         const monitoringSite = await response.json()
         return monitoringSite.data.isPrivate
@@ -665,7 +665,7 @@ test.describe('sites and workspaces', () => {
     await expect
       .poll(async () => {
         const response = await page.request.get(
-          `${apiBaseUrl}/api/data/datastreams/${fixtures.datastreams.public.id}`
+          `${apiBaseUrl}/api/ogc/collections/datastreams/items/${fixtures.datastreams.public.id}`
         )
         const datastream = await response.json()
         return datastream.data.isPrivate
@@ -679,7 +679,7 @@ test.describe('sites and workspaces', () => {
     await expect
       .poll(async () => {
         const response = await page.request.get(
-          `${apiBaseUrl}/api/data/datastreams/${fixtures.datastreams.public.id}`
+          `${apiBaseUrl}/api/ogc/collections/datastreams/items/${fixtures.datastreams.public.id}`
         )
         const datastream = await response.json()
         return datastream.data.isPrivate
@@ -688,7 +688,7 @@ test.describe('sites and workspaces', () => {
     await expect
       .poll(async () => {
         const response = await page.request.get(
-          `${apiBaseUrl}/api/data/datastreams/${fixtures.datastreams.public.id}`
+          `${apiBaseUrl}/api/ogc/collections/datastreams/items/${fixtures.datastreams.public.id}`
         )
         const datastream = await response.json()
         return datastream.data.isVisible
@@ -699,7 +699,7 @@ test.describe('sites and workspaces', () => {
     await expect
       .poll(async () => {
         const response = await page.request.get(
-          `${apiBaseUrl}/api/data/datastreams/${fixtures.datastreams.public.id}`
+          `${apiBaseUrl}/api/ogc/collections/datastreams/items/${fixtures.datastreams.public.id}`
         )
         const datastream = await response.json()
         return datastream.data.isVisible
@@ -715,7 +715,7 @@ test.describe('sites and workspaces', () => {
     await expect
       .poll(async () => {
         const response = await page.request.get(
-          `${apiBaseUrl}/api/data/datastreams/${fixtures.datastreams.public.id}`
+          `${apiBaseUrl}/api/ogc/collections/datastreams/items/${fixtures.datastreams.public.id}`
         )
         const datastream = await response.json()
         return datastream.data.isVisible

diff --git a/apps/data-management/e2e/specs/workspaces.spec.ts b/apps/data-management/e2e/specs/workspaces.spec.ts
@@ -396,7 +396,7 @@ test.describe('workspace management', () => {
     page,
   }) => {
     let failWorkspaceRequests = true
-    await page.route('**/api/data/workspaces?**', async (route) => {
+    await page.route('**/api/ogc/collections/workspaces/items?**', async (route) => {
       if (failWorkspaceRequests) {
         await route.fulfill({
           status: 503,
@@ -427,7 +427,7 @@ test.describe('workspace management', () => {
     page,
   }) => {
     await page.route(
-      `**/api/data/workspaces/${fixtures.workspaces.private.id}/service-accounts?**`,
+      `**/api/ogc/collections/workspaces/items/${fixtures.workspaces.private.id}/service-accounts?**`,
       (route) =>
         route.fulfill({
           status: 503,
@@ -452,7 +452,7 @@ test.describe('workspace management', () => {
   test('a slow overview response cannot overwrite the newly selected workspace', async ({
     page,
   }) => {
-    await page.route('**/api/data/monitoring-sites/site-summaries?**', async (route) => {
+    await page.route('**/api/ogc/collections/monitoring-sites/site-summaries?**', async (route) => {
       const workspaceId = new URL(route.request().url()).searchParams.get(
         'workspace_id'
       )

diff --git a/apps/data-management/playwright.config.ts b/apps/data-management/playwright.config.ts
@@ -108,7 +108,7 @@ export default defineConfig({
         E2E_TESTING: 'True',
         E2E_CONTROL_TOKEN: e2eControlToken,
       },
-      url: `${apiBaseUrl}/api/data/workspaces`,
+      url: `${apiBaseUrl}/api/ogc/collections/workspaces/items`,
       // Isolated per-test scenarios make reusing a developer's local API safe
       // and remove repeated migration/startup cost. CI always starts fresh.
       reuseExistingServer: !process.env.CI,

diff --git a/apps/data-management/src/composables/__tests__/useOrchestrationData.spec.ts b/apps/data-management/src/composables/__tests__/useOrchestrationData.spec.ts
@@ -100,7 +100,6 @@ describe('useOrchestrationData', () => {
       workspace_id: ['workspace-1'],
       data_connection_id: ['dc-1'],
       sortby: ['name'],
-      expand_related: true,
     })
 
     await data.fetchTasksForGroup('aggregation', 'monitoringSite-1', 'workspace-1')

diff --git a/apps/data-management/src/composables/orchestration/useOrchestrationData.ts b/apps/data-management/src/composables/orchestration/useOrchestrationData.ts
@@ -136,8 +136,7 @@ export function useOrchestrationData() {
           workspace_id: [requestedWorkspaceId],
           data_connection_id: [groupId],
           sortby: ['name'],
-          expand_related: true,
-        } as any)
+        })
         if (requestId !== taskRequestId) return
         workspaceTasks.value = items as any
       } else if (tab === 'aggregation') {

diff --git a/apps/data-management/src/store/observations.ts b/apps/data-management/src/store/observations.ts
@@ -129,8 +129,7 @@ export const useObservationStore = defineStore('observations', () => {
         const fetchedData = (await fetchObservations(
           datastream,
           beginTime,
-          endTime,
-          signal
+          endTime
         )) as ObservationArray
         ensureLatest()
         observationsRaw.value[id] = parseObservationRows(fetchedData)
@@ -153,8 +152,7 @@ export const useObservationStore = defineStore('observations', () => {
         beginDataPromise = fetchObservations(
           datastream,
           beginTime,
-          new Date(storedStart).toISOString(),
-          signal
+          new Date(storedStart).toISOString()
         ) as Promise<ObservationArray>
       }
 
@@ -164,8 +162,7 @@ export const useObservationStore = defineStore('observations', () => {
         endDataPromise = fetchObservations(
           datastream,
           new Date(storedEnd).toISOString(),
-          endTime,
-          signal
+          endTime
         ) as Promise<ObservationArray>
       }
 

diff --git a/apps/data-management/src/utils/__tests__/observationsUtils.spec.ts b/apps/data-management/src/utils/__tests__/observationsUtils.spec.ts
@@ -134,13 +134,12 @@ describe('fetchObservations', () => {
     const data = await fetchObservations(createDatastream(), start, end)
 
     expect(data).toEqual([['2023-01-01T00:00:00Z', 5]])
-    expect(getObservationsMock).toHaveBeenCalledWith(
-      '123',
-      expect.objectContaining({
-        phenomenon_time_min: start,
-        phenomenon_time_max: end,
-      })
-    )
+    expect(getObservationsMock).toHaveBeenCalledWith('123', {
+      sortby: ['phenomenonTime'],
+      limit: 50_000,
+      format: 'column',
+      datetime: `${start}/${end}`,
+    })
   })
 
   it('returns empty for non-ok or invalid payloads', async () => {

diff --git a/apps/data-management/src/utils/observationsUtils.ts b/apps/data-management/src/utils/observationsUtils.ts
@@ -30,8 +30,7 @@ const toObservationRows = (columnar: Record<string, unknown>): DataArray => {
 export const fetchObservations = async (
   datastream: Datastream,
   startTime: string | null = null,
-  endTime: string | null = null,
-  signal?: AbortSignal
+  endTime: string | null = null
 ) => {
   const { id, phenomenonBeginTime, phenomenonEndTime } = datastream
   if (!phenomenonBeginTime || !phenomenonEndTime) return []
@@ -40,10 +39,8 @@ export const fetchObservations = async (
     sortby: ['phenomenonTime'],
     limit: 50_000,
     format: 'column',
-    phenomenon_time_min: startTime ?? phenomenonBeginTime,
-    phenomenon_time_max: endTime ?? phenomenonEndTime,
+    datetime: `${startTime ?? phenomenonBeginTime}/${endTime ?? phenomenonEndTime}`,
   }
-  if (signal) options.signal = signal
 
   const res = await hs.datastreams.getObservations(id, options)
 

diff --git a/apps/docs/docs/developing-and-contributing/how-to/using-the-typescript-client.md b/apps/docs/docs/developing-and-contributing/how-to/using-the-typescript-client.md
@@ -568,8 +568,7 @@ const observations = await hs.datastreams.getObservations(
   {
     format: "row",
     sortby: ["phenomenonTime"],
-    phenomenon_time_min: "2025-01-01T00:00:00Z",
-    phenomenon_time_max: "2025-12-31T23:59:59Z",
+    datetime: "2025-01-01T00:00:00Z/2025-12-31T23:59:59Z",
     page_size: 1000,
   }
 );
@@ -907,8 +906,7 @@ const sourceRes = await hs.datastreams.getObservations(
   {
     format: "record",
     sortby: ["phenomenonTime"],
-    phenomenon_time_min: rangeStart,
-    phenomenon_time_max: rangeEnd,
+    datetime: `${rangeStart}/${rangeEnd}`,
   }
 );
 

diff --git a/apps/docs/docs/references/hydroserver-apis.md b/apps/docs/docs/references/hydroserver-apis.md
@@ -14,7 +14,7 @@ HydroServer implements the [OGC SensorThings API](https://www.ogc.org/standard/s
 
 The interactive documentation for this API is available at:
 
-https://playground.hydroserver.org/api/data/docs
+https://playground.hydroserver.org/api/ogc/docs
 
 ### About
 

diff --git a/apps/docs/docs/user-guides/how-to/using-the-python-client.md b/apps/docs/docs/user-guides/how-to/using-the-python-client.md
@@ -374,11 +374,11 @@ Result-qualifier creation accepts `name` and `description` by position or by key
 | `intended_time_spacing_unit` | `str \| None` | Yes | `"seconds"`, `"minutes"`, `"hours"`, `"days"` |
 | `status` | `str \| None` | Yes | |
 | `result_type` | `str` | Yes | |
-| `value_count` | `int \| None` | Yes | |
-| `phenomenon_begin_time` | `datetime \| None` | Yes | |
-| `phenomenon_end_time` | `datetime \| None` | Yes | |
-| `result_begin_time` | `datetime \| None` | Yes | |
-| `result_end_time` | `datetime \| None` | Yes | |
+| `value_count` | `int \| None` | No | Maintained from observations |
+| `phenomenon_begin_time` | `datetime \| None` | No | Maintained from observations |
+| `phenomenon_end_time` | `datetime \| None` | No | Maintained from observations |
+| `result_begin_time` | `datetime \| None` | No | Maintained from observations |
+| `result_end_time` | `datetime \| None` | No | Maintained from observations |
 | `is_private` | `bool` | Yes | |
 | `is_visible` | `bool` | Yes | |
 | `monitoring_site_id` | `UUID` | Yes | |
@@ -412,9 +412,7 @@ hs_api.datastreams.create(name, description, monitoring_site, method, observed_p
                           unit, observation_type, result_type, sampled_medium, no_data_value,
                           aggregation_statistic, time_aggregation_interval,
                           time_aggregation_interval_unit, intended_time_spacing=None,
-                          intended_time_spacing_unit=None, status=None, value_count=None,
-                          phenomenon_begin_time=None, phenomenon_end_time=None,
-                          result_begin_time=None, result_end_time=None,
+                          intended_time_spacing_unit=None, status=None,
                           is_private=False, is_visible=True, uid=None) -> Datastream
 ```
 

diff --git a/...utorials/getting-started-with-hydroserverpy/part-3-automating-data-ingestion.md b/...utorials/getting-started-with-hydroserverpy/part-3-automating-data-ingestion.md
@@ -86,7 +86,6 @@ stage_datastream = hs_api.datastreams.create(
     time_aggregation_interval_unit='minutes',
     intended_time_spacing=15,
     intended_time_spacing_unit='minutes',
-    phenomenon_end_time='2025-01-01T00:00:00Z',
     status='Ongoing',
     is_private=False,
 )
@@ -96,7 +95,7 @@ print(f"{stage_datastream.name}: {stage_datastream.uid}")
 
 ## Create a data connection
 
-A data connection describes where your data comes from and how to read it. Our source is the USGS Instantaneous Values API, which returns JSON. We'll define two run-time placeholder variables — `start_date` and `end_date` — that get substituted into the URL each time the task runs. HydroServer automatically sets `start_date` to the timestamp of the most recent observation already in the datastream, so you never re-fetch data you already have.
+A data connection describes where your data comes from and how to read it. Our source is the USGS Instantaneous Values API, which returns JSON. We'll define two run-time placeholder variables — `start_date` and `end_date` — that get substituted into the URL each time the task runs. HydroServer automatically sets `start_date` to the timestamp of the most recent observation already in the datastream, so you never re-fetch data you already have. Our datastream is new and has no observations yet, so the first run starts from 1970-01-01 and pulls in all the history USGS has for this gage; later runs pick up from the most recent observation.
 
 ```python
 usgs_data_connection = hs_api.dataconnections.create(

diff --git a/apps/qc-app/docs/API_REFERENCE.md b/apps/qc-app/docs/API_REFERENCE.md
@@ -55,9 +55,9 @@ qc-utils service layer lives under `packages/qc-utils/src/services/`.
 
 ### Observation read
 
-Paged GET against `/data/datastreams/{id}/observations` with
-`format=column`, `sortby=phenomenonTime`, `page_size=50000`, and
-`phenomenon_time_min` / `phenomenon_time_max` ISO-8601 bounds. The app
+Paged GET against `/api/ogc/collections/observations/items` with
+`datastream_id={id}`, `format=column`, `sortby=phenomenonTime`,
+`limit=50000`, and a `datetime` interval (`start/end`, RFC 3339). The app
 paginates client-side and caches the merged window in
 `useObservationStore`.
 

diff --git a/apps/qc-app/e2e/plot-no-intended-spacing.spec.ts b/apps/qc-app/e2e/plot-no-intended-spacing.spec.ts
@@ -89,7 +89,7 @@ async function patchDatastreamFixture(route: Route): Promise<void> {
     processingLevels,
     units,
   }
-  if (/\/api\/data\/datastreams$/.test(path)) {
+  if (/\/api\/ogc\/collections\/datastreams\/items$/.test(path)) {
     const patched = datastreams.map(withoutIntendedSpacing)
     return route.fulfill({
       status: 200,
@@ -102,7 +102,7 @@ async function patchDatastreamFixture(route: Route): Promise<void> {
       }),
     })
   }
-  const single = path.match(/\/api\/data\/datastreams\/([^/]+)$/)
+  const single = path.match(/\/api\/ogc\/collections\/datastreams\/items\/([^/]+)$/)
   if (single) {
     const id = single[1]
     const ds = datastreams.find((d) => d.id === id) ?? datastreams[0]!
@@ -124,7 +124,7 @@ test.describe('plot: datastream without intendedTimeSpacing', () => {
     // wins for both the list and single-get endpoints. The sub-path
     // `/observations` is left to fall through.
     await page.route(
-      /\/api\/data\/datastreams(\/[^/]+)?(\?.*)?$/,
+      /\/api\/ogc\/collections\/datastreams\/items(\/[^/]+)?(\?.*)?$/,
       patchDatastreamFixture
     )
   })