Skip to content

Commit 7724aa7

Browse files
committed
fix: rename sd-data-ingest → oceanstream-cli in all references
The actual GitHub repo is OceanStreamIO/oceanstream-cli. sd-data-ingest was the old local folder name.
1 parent 0bec552 commit 7724aa7

10 files changed

Lines changed: 19 additions & 19 deletions

.github/copilot-instructions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ Sensor data (TCP/UDP stream, file drop, IoT Edge message)
3030

3131
### Oceanstream Dependency
3232

33-
All data parsing is handled by the **oceanstream** library (`oceanstream` package from `sd-data-ingest` repo). Sensorstream installs it with `[geotrack,adcp]` extras:
33+
All data parsing is handled by the **oceanstream** library (`oceanstream` package from `oceanstream-cli` repo). Sensorstream installs it with `[geotrack,adcp]` extras:
3434

35-
- **Local dev**: `pip install -e "../sd-data-ingest[geotrack,adcp]"`
35+
- **Local dev**: `pip install -e "../oceanstream-cli[geotrack,adcp]"`
3636
- **Production**: `pip install "oceanstream[geotrack,adcp] @ git+https://github.com/OceanStreamIO/oceanstream-cli.git"`
3737

3838
The adapter (`ingest/adapter.py`) provides:
@@ -138,7 +138,7 @@ The `test/conftest.py` session fixtures automatically:
138138
2. Use size-based freshness checks on subsequent runs
139139
3. Fall back to local `test_data/` if no Azure connection
140140

141-
**Connection string**: Set `AZURE_CONNECTION_STRING` in `.env` or environment. The conftest also checks `../sd-data-ingest/.env`.
141+
**Connection string**: Set `AZURE_CONNECTION_STRING` in `.env` or environment. The conftest also checks `../oceanstream-cli/.env`.
142142

143143
Key fixtures (all session-scoped):
144144
- `test_data_dir` — root of synced test data

Dockerfile.Linux.amd64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99

1010
# Install oceanstream from git
1111
ARG OCEANSTREAM_BRANCH=main
12-
ARG OCEANSTREAM_REPO=https://github.com/OceanStreamIO/sd-data-ingest.git
12+
ARG OCEANSTREAM_REPO=https://github.com/OceanStreamIO/oceanstream-cli.git
1313
RUN git clone --depth 1 -b ${OCEANSTREAM_BRANCH} ${OCEANSTREAM_REPO} /tmp/oceanstream && \
1414
pip install --no-cache-dir "/tmp/oceanstream[geotrack,adcp]" && \
1515
rm -rf /tmp/oceanstream

Dockerfile.Linux.arm64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99

1010
# Install oceanstream from git
1111
ARG OCEANSTREAM_BRANCH=main
12-
ARG OCEANSTREAM_REPO=https://github.com/OceanStreamIO/sd-data-ingest.git
12+
ARG OCEANSTREAM_REPO=https://github.com/OceanStreamIO/oceanstream-cli.git
1313
RUN git clone --depth 1 -b ${OCEANSTREAM_BRANCH} ${OCEANSTREAM_REPO} /tmp/oceanstream && \
1414
pip install --no-cache-dir "/tmp/oceanstream[geotrack,adcp]" && \
1515
rm -rf /tmp/oceanstream

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ python-dotenv
1616
psutil
1717

1818
# Oceanstream library (provides all parsing: NMEA, CSV, CTD hex, ADCP)
19-
# For local development, install with: pip install -e ../sd-data-ingest[geotrack,adcp]
19+
# For local development, install with: pip install -e ../oceanstream-cli[geotrack,adcp]
2020
# For production, install from git:
2121
# pip install "oceanstream[geotrack,adcp] @ git+https://github.com/OceanStreamIO/oceanstream-cli.git"

simulate/file_simulator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
Usage::
88
99
python -m simulate.file_simulator \\
10-
--source-dir ../sd-data-ingest/raw_data/emso \\
10+
--source-dir ../oceanstream-cli/raw_data/emso \\
1111
--target-dir /tmp/sensorstream-watch \\
1212
--interval 10
1313
1414
python -m simulate.file_simulator \\
15-
--source-dir ../sd-data-ingest/raw_data/r2r \\
15+
--source-dir ../oceanstream-cli/raw_data/r2r \\
1616
--target-dir /tmp/sensorstream-watch \\
1717
--interval 5 --loop
1818
"""

simulate/stream_simulator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
Usage::
77
88
python -m simulate.stream_simulator \\
9-
--file ../sd-data-ingest/raw_data/r2r/RR2401_gnss_gp170_aft-2024-02-17.txt \\
9+
--file ../oceanstream-cli/raw_data/r2r/RR2401_gnss_gp170_aft-2024-02-17.txt \\
1010
--protocol tcp --port 9100 --rate 10 --loop
1111
1212
python -m simulate.stream_simulator \\
13-
--file ../sd-data-ingest/raw_data/emso/EMSO_OBSEA_CTD_30min.csv \\
13+
--file ../oceanstream-cli/raw_data/emso/EMSO_OBSEA_CTD_30min.csv \\
1414
--protocol udp --port 9100 --format csv --rate 5
1515
"""
1616

standalone.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
99
# Process files from a directory
1010
python standalone.py \\
11-
--input-dir ../sd-data-ingest/raw_data/emso \\
11+
--input-dir ../oceanstream-cli/raw_data/emso \\
1212
--output-dir ./output \\
1313
--campaign-id EMSO_test \\
1414
--provider emso
@@ -27,7 +27,7 @@
2727
2828
# Run with built-in stream simulator
2929
python standalone.py \\
30-
--simulate-stream ../sd-data-ingest/raw_data/r2r/RR2401_gnss_gp170_aft-2024-02-17.txt \\
30+
--simulate-stream ../oceanstream-cli/raw_data/r2r/RR2401_gnss_gp170_aft-2024-02-17.txt \\
3131
--output-dir ./output \\
3232
--campaign-id R2R_test
3333
"""

test/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
-----------
1414
AZURE_CONNECTION_STRING : str
1515
Connection string for the ``ne1osvmdevtest`` storage account.
16-
Loaded from ``../sd-data-ingest/.env`` or the local ``.env``.
16+
Loaded from ``../oceanstream-cli/.env`` or the local ``.env``.
1717
SENSORSTREAM_TEST_CONTAINER : str
1818
Container name (default ``sensorstream-test``).
1919
SENSORSTREAM_TEST_CACHE : str
@@ -41,7 +41,7 @@
4141
# Try multiple .env locations
4242
for _env in [
4343
Path(__file__).resolve().parent.parent / ".env",
44-
Path(__file__).resolve().parent.parent.parent / "sd-data-ingest" / ".env",
44+
Path(__file__).resolve().parent.parent.parent / "oceanstream-cli" / ".env",
4545
]:
4646
if _env.exists():
4747
load_dotenv(_env)

test/generate_test_data.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,19 +192,19 @@ def main():
192192

193193
# Copy the original EMSO for comparison
194194
import shutil
195-
src = Path(__file__).parent.parent / "sd-data-ingest" / "raw_data" / "emso" / "EMSO_OBSEA_CTD_30min.csv"
195+
src = Path(__file__).parent.parent / "oceanstream-cli" / "raw_data" / "emso" / "EMSO_OBSEA_CTD_30min.csv"
196196
if src.exists():
197197
shutil.copy2(src, output_dir / "ctd" / "EMSO_OBSEA_CTD_30min.csv")
198198
print(f"Copied original EMSO CSV → {output_dir / 'ctd' / 'EMSO_OBSEA_CTD_30min.csv'}")
199199

200200
# Copy processed R2R CNV for testing
201-
cnv_src = Path(__file__).parent.parent / "sd-data-ingest" / "raw_data" / "r2r" / "RR2205_ctd_validation" / "processed" / "11901_1db.cnv"
201+
cnv_src = Path(__file__).parent.parent / "oceanstream-cli" / "raw_data" / "r2r" / "RR2205_ctd_validation" / "processed" / "11901_1db.cnv"
202202
if cnv_src.exists():
203203
shutil.copy2(cnv_src, output_dir / "ctd" / "RR2205_11901_1db.cnv")
204204
print(f"Copied R2R CNV → {output_dir / 'ctd' / 'RR2205_11901_1db.cnv'}")
205205

206206
# Take a 1000-line slice of the GNSS file for a smaller test
207-
gnss_src = Path(__file__).parent.parent / "sd-data-ingest" / "raw_data" / "r2r" / "RR2401_gnss_gp170_aft-2024-02-17.txt"
207+
gnss_src = Path(__file__).parent.parent / "oceanstream-cli" / "raw_data" / "r2r" / "RR2401_gnss_gp170_aft-2024-02-17.txt"
208208
if gnss_src.exists():
209209
with open(gnss_src) as f:
210210
lines = [next(f) for _ in range(2000)]

test/test_azure_e2e.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
from dotenv import load_dotenv
2929

30-
# Load .env from the sd-data-ingest project (where the connection string is)
31-
_env_path = Path(__file__).resolve().parent.parent.parent / "sd-data-ingest" / ".env"
30+
# Load .env from the oceanstream-cli project (where the connection string is)
31+
_env_path = Path(__file__).resolve().parent.parent.parent / "oceanstream-cli" / ".env"
3232
if _env_path.exists():
3333
load_dotenv(_env_path)
3434
# Also try local .env

0 commit comments

Comments
 (0)