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

Jump to bottom

Hotfix/discrepency main dev fix #562

Merged
merged 4 commits into from
Sep 18, 2024
Merged

Hotfix/discrepency main dev fix #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46f66d8
1.5 WattTime v3 Updates (#547)
vaughanknight Jul 23, 2024
93d9ba2
Merge branch 'main' into dev
danuw Sep 17, 2024
d81d12c
Update 1-pr.yaml
danuw Sep 18, 2024
48d743b
Update dev_carbon-aware-api.yml
danuw Sep 18, 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
6 changes: 3 additions & 3 deletions .github/workflows/1-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
working-directory: ./src/CarbonAware.WebApi/src

- name: Upload swagger artifact
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: pr-swagger.yaml
path: src/CarbonAware.WebApi/src/wwwroot/api/v1/swagger.yaml
Expand Down Expand Up @@ -184,11 +184,11 @@ jobs:
env:
DOTNET_ROLL_FORWARD: LatestMajor
- name: Upload dev artifact
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: dev-swagger.yaml
path: src/CarbonAware.WebApi/src/wwwroot/api/v1/swagger.yaml
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: pr-swagger.yaml
path: ./src/CarbonAware.WebApi/src/wwwroot/api/v1/pr-swagger.yaml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dev_carbon-aware-api.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/myapp

- name: Upload artifact for deployment job
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: CarbonAwareApi
path: ${{env.DOTNET_ROOT}}/myapp
Expand All @@ -46,7 +46,7 @@ jobs:

steps:
- name: Download artifact from build job
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: CarbonAwareApi

Expand Down
10 changes: 5 additions & 5 deletions casdk-docs/docs/architecture/decisions/0016-watt-time-v3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ The `Login` is now at a different base URL, and to avoid any future issues a dif

| API Endpoint | Description | Path (v2) | Path (v3) | Notes |
|--------------|-------------|-----------|-----------|---|
| Data | Get data | /data | /historical | _Request_ <li> `starttime` is now `start` and mandatory </li> <li> `endtime` is now `end` and mandatory </li><li> `ba` is now `region` </li><li> `signal_type` added _Response_ </li><li> `signal_type` added</li>|
| Forecast | Get forecast| /forecast | /forecast | No longer be used for historical data _Request_ <li> `ba` is now `region` </li><li> `extended_forecast` removed </li><li> `horizon_hours` added </li><li> `signal_type` added </li><li> Historical forecasts are now at `/forecast/historical` <br /> _Response_ </li><li> `signal_type` added </li>
| Historical | Get historical forecast data | /historical (?) | /forecast/historical (?) | This changed signficantly. <br /> _Request_ <li> `ba` is now `region` </li><li> `starttime` is now `start` and mandatory </li><li> `endtime` is now `end` and mandatory </li><li> `signal_type` added <br /> _Response_ </li><li> `signal_type` added </li>
| Balancing Authority From Location | Get balancing authority from location | /ba-from-loc | /region-from-loc | Check if the CA SDK uses BA at all <br /><br /> _Request_ <li> `name` is now `region_full_name` </li><li> `abbrev` is now `region` </li><li> `signal_type` added <br /> _Response_ </li><li> `id` removed </li><li> `signal_type` added </li> |
| Login | User login | https://api2.watttime.org/v2/login | https://api.watttime.org/login | Path has changed from being version specific to being no longer related to the API version. <br /><br /> Updated in `WattTimeClient` to now have 2 HTTP clients to decouple versions from the login. |
| Data | Get data | /data | /historical | _Request_ <li> `starttime` is now `start` and mandatory <li> `endtime` is now `end` and mandatory <li> `ba` is now `region` <li> `signal_type` added <br> _Response_ <li> `signal_type` added |
| Forecast | Get forecast| /forecast | /forecast | <br> No longer be used for historical data <br> _Request_ <li> `ba` is now `region` <li> `extended_forecast` removed <li> `horizon_hours` added <li> `signal_type` added <li> Historical forecasts are now at `/forecast/historical` <br> _Response_ <li> `signal_type` added |
| Historical | Get historical forecast data | /historical (?) | /forecast/historical (?) | This changed signficantly. <br> _Request_ <li> `ba` is now `region` <li> `starttime` is now `start` and mandatory <li> `endtime` is now `end` and mandatory <li> `signal_type` added <br> _Response_ <li> `signal_type` added |
| Balancing Authority From Location | Get balancing authority from location | /ba-from-loc | /region-from-loc | Check if the CA SDK uses BA at all <br><br> _Request_ <li> `name` is now `region_full_name` <li> `abbrev` is now `region` <li> `signal_type` added <br> _Response_ <li> `id` removed <li> `signal_type` added |
| Login | User login | https://api2.watttime.org/v2/login | https://api.watttime.org/login | Path has changed from being version specific to being no longer related to the API version. <br><br> Updated in `WattTimeClient` to now have 2 HTTP clients to decouple versions from the login. |

### Query Strings

Expand Down
Loading