Connect data for graph to backend

sweep-ai[bot] commented 1 year ago

PR Feedback: 👎

Description

This PR modifies the index.scala.html file to retrieve JSON data from the /data/consumption REST endpoint defined in JsonDataRoutes.scala and uses that data as the source for the trace1 Plotly scatter graph. It also adds a new test case in JsonDataRoutesTest.scala to ensure that the /data/consumption endpoint returns data in the correct format for the graph.

Summary of Changes

Modified index.scala.html to replace the hardcoded data in the trace1 data structure with a placeholder variable and added a new function to make an HTTP GET request to the /data/consumption endpoint and assign the returned JSON data to trace1Data.
Modified index.scala.html to call the new function before drawing the graph and modified the trace1 data structure to use trace1Data for its x and y properties.
Added a new test case in JsonDataRoutesTest.scala to ensure that the /data/consumption endpoint returns data in the correct format for the graph.

Please review and merge these changes.

Fixes #3.

🎉 Latest improvements to Sweep:

Sweep now uses the rope library to refactor Python! Check out Large Language Models are Bad at Refactoring Code. To have Sweep refactor your code, try sweep: Refactor <your_file>.py to be more modular!
Sweep finds and fixes bugs in your code by writing unit tests! Check out Having GPT-4 Iterate on Unit Tests like a Human.

💡 To get Sweep to edit this pull request, you can:

Comment below, and Sweep can edit the entire PR
Comment on a file, Sweep will only modify the commented file
Edit the original issue to get Sweep to recreate the PR from scratch

sweep-ai[bot] commented 1 year ago

Sandbox Executions

[X] Check src/main/twirl/views/index.scala.html ✗

Sandbox logs for

trunk fmt src/main/twirl/views/index.scala.html || exit 0 1/2 ✓

  FAILURES  
 prettier  src/main/twirl/views/index.scala.html  .trunk/out/vCGFq.yaml
  NOTICES  
 A tool failed to run. You can open the details yaml file for more information.
Checked 0 files
✖ No issues, 1 failure

trunk check --fix --print-failures src/main/twirl/views/index.scala.html 2/2 ❌ (`1`)

  ISSUES  
src/main/twirl/views/index.scala.html:95:1
 95:1  high   trailing whitespace.  git-diff-check/error
  FAILURES  
 prettier  src/main/twirl/views/index.scala.html  .trunk/out/tCUIR.yaml
  NOTICES  
 A tool failed to run. You can open the details yaml file for more information.
Checked 1 file
✖ 1 new issue
# .trunk/out/tCUIR.yaml
trunk_cli_version: 1.17.2
title: prettier exited with exit_code=2
report:
  - prettier exited with exit_code=2
  - linter:
      command: |
        /root/.cache/trunk/tools/prettier/3.0.3-f40a31f1cf22ae011727ab1e40e55171/node_modules/.bin/prettier -w src/main/twirl/views/index.scala.html
      stdin_path: (none)
      run_from: /tmp/trunk-0/2lbTP3/aRdxv9
      timeout: 10m
      rerun: (cd /tmp/trunk-0/2lbTP3/aRdxv9; env -i PATH=/root/.cache/trunk/tools/prettier/3.0.3-f40a31f1cf22ae011727ab1e40e55171/node_modules/.bin:/root/.cache/trunk/tools/node/18.12.1-00ae74f39ac4de3ff3c7e3686016ebf3/bin:/root/.cache/trunk/tools/node/18.12.1-00ae74f39ac4de3ff3c7e3686016ebf3:/root/.nvm/versions/node/v18.17.0/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin NODE_PATH=/root/.cache/trunk/tools/prettier/3.0.3-f40a31f1cf22ae011727ab1e40e55171/node_modules HOME=/root /root/.cache/trunk/tools/prettier/3.0.3-f40a31f1cf22ae011727ab1e40e55171/node_modules/.bin/prettier -w src/main/twirl/views/index.scala.html)
      affects_cache:
        []
      direct_configs:
        []
      exit_status: exited
      exit_code: 2
      stdout: (none)
      stderr: |
        [error] src/main/twirl/views/index.scala.html: SyntaxError: Unexpected closing tag "script". It may happen when the tag has already been closed by another tag. For more info see https://www.w3.org/TR/html5/syntax.html#closing-elements-that-have-implied-end-tags (155:9)
        [error]   153 |
        [error]   154 |
        [error] > 155 |         
        [error]       |         ^^^^^^^^^
        [error]   156 |     
        [error]   157 | 
    parser: |
      (none)

[X] Check src/main/twirl/views/index.scala.html ✗

Sandbox logs for

trunk fmt src/main/twirl/views/index.scala.html || exit 0 1/2 ✓

  FAILURES  
 prettier  src/main/twirl/views/index.scala.html  .trunk/out/B1HeS.yaml
  NOTICES  
 A tool failed to run. You can open the details yaml file for more information.
Checked 0 files
✖ No issues, 1 failure

trunk check --fix --print-failures src/main/twirl/views/index.scala.html 2/2 ❌ (`1`)

  FAILURES  
 prettier  src/main/twirl/views/index.scala.html  .trunk/out/TS4Nd.yaml
  NOTICES  
 A tool failed to run. You can open the details yaml file for more information.
Checked 1 file
✖ No issues, 1 failure
# .trunk/out/TS4Nd.yaml
trunk_cli_version: 1.17.2
title: prettier exited with exit_code=2
report:
  - prettier exited with exit_code=2
  - linter:
      command: |
        /root/.cache/trunk/tools/prettier/3.0.3-f40a31f1cf22ae011727ab1e40e55171/node_modules/.bin/prettier -w src/main/twirl/views/index.scala.html
      stdin_path: (none)
      run_from: /tmp/trunk-0/DbL2hM/4nJdK6
      timeout: 10m
      rerun: (cd /tmp/trunk-0/DbL2hM/4nJdK6; env -i PATH=/root/.cache/trunk/tools/prettier/3.0.3-f40a31f1cf22ae011727ab1e40e55171/node_modules/.bin:/root/.cache/trunk/tools/node/18.12.1-00ae74f39ac4de3ff3c7e3686016ebf3/bin:/root/.cache/trunk/tools/node/18.12.1-00ae74f39ac4de3ff3c7e3686016ebf3:/root/.nvm/versions/node/v18.17.0/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin HOME=/root NODE_PATH=/root/.cache/trunk/tools/prettier/3.0.3-f40a31f1cf22ae011727ab1e40e55171/node_modules /root/.cache/trunk/tools/prettier/3.0.3-f40a31f1cf22ae011727ab1e40e55171/node_modules/.bin/prettier -w src/main/twirl/views/index.scala.html)
      affects_cache:
        []
      direct_configs:
        []
      exit_status: exited
      exit_code: 2
      stdout: (none)
      stderr: |
        [error] src/main/twirl/views/index.scala.html: SyntaxError: Unexpected closing tag "script". It may happen when the tag has already been closed by another tag. For more info see https://www.w3.org/TR/html5/syntax.html#closing-elements-that-have-implied-end-tags (137:9)
        [error]   135 |
        [error]   136 |
        [error] > 137 |         
        [error]       |         ^^^^^^^^^
        [error]   138 |     
        [error]   139 | 
    parser: |
      (none)

[X] Check src/main/twirl/views/index.scala.html ✓

Sandbox logs for https://github.com/inigo/octopusviz/commit/fb4dd75fe2522c5e3ce10be6e14019fe8e2f931c

trunk fmt src/main/twirl/views/index.scala.html || exit 0 1/2 ✓
 ✔ Formatted src/main/twirl/views/index.scala.html
Re-checking autofixed files...

Checked 1 file
✔ No issues
trunk check --fix --print-failures src/main/twirl/views/index.scala.html 2/2 ✓
Checked 1 file
✔ No issues

[X] Check src/main/twirl/views/index.scala.html ✓

Sandbox logs for

trunk fmt src/main/twirl/views/index.scala.html || exit 0 1/2 ✓
Checked 1 file
✔ No issues
trunk check --fix --print-failures src/main/twirl/views/index.scala.html 2/2 ✓
Checked 1 file
✔ No issues

[X] Check src/main/twirl/views/index.scala.html ✓

Sandbox logs for

trunk fmt src/main/twirl/views/index.scala.html || exit 0 1/2 ✓
Checked 1 file
✔ No issues
trunk check --fix --print-failures src/main/twirl/views/index.scala.html 2/2 ✓
Checked 1 file
✔ No issues

[X] Check src/test/scala/net/surguy/octopusviz/http/JsonDataRoutesTest.scala ✓

Sandbox logs for

trunk fmt src/test/scala/net/surguy/octopusviz/http/JsonDataRoutesTest.scala || exit 0 1/2 ✓
Found no applicable linters for the requested path
trunk check --fix --print-failures src/test/scala/net/surguy/octopusviz/http/JsonDataRoutesTest.scala 2/2 ✓
Checked 1 file
✔ No issues

sweep-ai[bot] commented 1 year ago

Apply Sweep Rules to your PR?

[ ] Apply: All new business logic should have corresponding unit tests.
[ ] Apply: Refactor large functions to be more modular.

sweep-ai[bot] commented 1 year ago

The command: Run bin/sbt test yielded the following error: ##[error]Process completed with exit code 1. Here are the logs:

[0m[[0m[0minfo[0m] [0m[0mwelcome to sbt 1.9.6 (Eclipse Adoptium Java 21.0.1)[0m
[0m[[0m[0minfo[0m] [0m[0mloading settings for project octopusviz-build from plugins.sbt ...[0m
[0m[[0m[0minfo[0m] [0m[0mloading project definition from /home/runner/work/octopusviz/octopusviz/project[0m
[0m[[0m[0minfo[0m] [0m[0mloading settings for project root from build.sbt ...[0m
[0m[[0m[0minfo[0m] [0m[0mset current project to octopus-energyviz (in build file:/home/runner/work/octopusviz/octopusviz/)[0m
[0m[[0m[0minfo[0m] [0m[0mcompiling 13 Scala sources to /home/runner/work/octopusviz/octopusviz/target/scala-3.3.1/classes ...[0m
[0m[[0m[31merror[0m] [0m[0m/home/runner/work/octopusviz/octopusviz/src/main/twirl/views/index.scala.html:1:29: end of toplevel definition expected but '@' found[0m
[0m[[0m[31merror[0m] [0m[0m@import java.time.LocalDate @import net.surguy.octopusviz.http.DateUtils._[0m
[0m[[0m[31merror[0m] [0m[0m                            ^[0m
[0m[[0m[31merror[0m] [0m[0m/home/runner/work/octopusviz/octopusviz/src/main/twirl/views/index.scala.html:20:32: Not found: formatDate[0m
[0m[[0m[31merror[0m] [0m[0m[0m
[0m[[0m[31merror[0m] [0m[0m[34mExplanation[0m[0m
[0m[[0m[31merror[0m] [0m[0m[34m===========[0m[0m
[0m[[0m[31merror[0m] [0m[0mThe identifier for `formatDate` is not bound, that is,[0m
[0m[[0m[31merror[0m] [0m[0mno declaration for this identifier can be found.[0m
[0m[[0m[31merror[0m] [0m[0mThat can happen, for example, if `formatDate` or its declaration has either been[0m
[0m[[0m[31merror[0m] [0m[0mmisspelt or if an import is missing.[0m
[0m[[0m[31merror[0m] [0m[0m      Energy consumption from @formatDate(startDate) to @formatDate(endDate)[0m
[0m[[0m[31merror[0m] [0m[0m                               ^[0m
[0m[[0m[31merror[0m] [0m[0m/home/runner/work/octopusviz/octopusviz/src/main/twirl/views/index.scala.html:20:58: Not found: formatDate[0m
[0m[[0m[31merror[0m] [0m[0m[0m
[0m[[0m[31merror[0m] [0m[0m[34mExplanation[0m[0m
[0m[[0m[31merror[0m] [0m[0m[34m===========[0m[0m
[0m[[0m[31merror[0m] [0m[0mThe identifier for `formatDate` is not bound, that is,[0m
[0m[[0m[31merror[0m] [0m[0mno declaration for this identifier can be found.[0m
[0m[[0m[31merror[0m] [0m[0mThat can happen, for example, if `formatDate` or its declaration has either been[0m
[0m[[0m[31merror[0m] [0m[0mmisspelt or if an import is missing.[0m
[0m[[0m[31merror[0m] [0m[0m      Energy consumption from @formatDate(startDate) to @formatDate(endDate)[0m
[0m[[0m[31merror[0m] [0m[0m                                                         ^[0m
[0m[[0m[31merror[0m] [0m[0mthree errors found[0m
[0m[[0m[31merror[0m] [0m[0m(Compile / [31mcompileIncremental[0m) Compilation failed[0m
[0m[[0m[31merror[0m] [0m[0mTotal time: 14 s, completed Nov 10, 2023, 10:31:15 PM[0m
[0J

sweep-ai[bot] commented 1 year ago

🚀 Wrote Changes

Done.

inigo commented 1 year ago

There are some parts of this that are almost correct, but mostly this is wrong.

There are unnecessary changes to the file, particularly the imports and header, that mean that the code no longer compiles.

The comments are re-ordered in the head, such that they no longer make sense.

var trace1 and other code is now duplicated, so there are three copies of it.

The fetch is approaching correct, but doesn't deal with the async retrieval.

It's good to add a test for the route, but without adding a mock as well, it's unlikely to be correct.

sweep-ai[bot] commented 1 year ago

🚀 Wrote Changes

Done.

inigo / octopusviz