-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
Tsp report #536
Open
pchtsp
wants to merge
98
commits into
develop
Choose a base branch
from
tsp_report
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Tsp report #536
Changes from 26 commits
Commits
Show all changes
98 commits
Select commit
Hold shift + click to select a range
ce04099
first version of tsp report + changes (many more requirements added)
pchtsp dad9f0e
add how-to reports to README
pchtsp c6f4c0f
added documentation on developing reports
pchtsp 5780bff
unsuccessful tests with quarto library to call quarto and generate re…
pchtsp 1b7378d
Merge branch 'master' into tsp_report
pchtsp f6b4704
added reports model, endpoint, schemas. Each report has an execution_…
pchtsp 17e9173
fixed some wrong comments
pchtsp 4496e11
migrations to database for reports
pchtsp a3bcdaf
pass executions tests
pchtsp 82f0aa9
delete airflow dependency
pchtsp f30ee6d
added some additional I/O methods to the Experiment and a `generate_r…
pchtsp 0b1619f
now it's possible to run the create the report from python using a js…
pchtsp 409662f
New activate_dags (#543)
ggsdc 9f83a97
Fixed numpy and pandas conoined error
ggsdc 5c0fb2d
make tests valid with env. var CF_ALARMS_ENDPOINT=0
pchtsp 59ad52b
Merge remote-tracking branch 'origin/tsp_report' into tsp_report
pchtsp 132a0c3
added quarto to github actions
pchtsp e0737aa
quarto is needed in test_dags
pchtsp 83610f8
Small adjustments to pass unit tests on local and on github actions
ggsdc 0427605
some working tests on reports.
pchtsp ee96b79
Merge remote-tracking branch 'origin/tsp_report' into tsp_report
pchtsp 4050939
Adjustments to file storage.
ggsdc 082eff9
Added test for main get
ggsdc 3da8771
fix uploading tests: add static and use absolute path for e.v. UPLOAD…
pchtsp 0be825a
some comments
pchtsp 3a47e13
Added some more funtionalities
ggsdc a6ecb0d
added endpoint to client and finished code in dag.
pchtsp 9268ac9
Merge remote-tracking branch 'origin/tsp_report' into tsp_report
pchtsp 5b566f9
Merge branch 'develop' into tsp_report
ggsdc b8d711f
Small change for CodeQL
ggsdc 35d9cc8
Some more checks on path building to restrict where the reports can b…
ggsdc b1d79db
Made delete endpoint to delete report file.
ggsdc 95535bf
Added test for creation of report
ggsdc 6077e20
Fixed wrong path
ggsdc 0171fd8
added some unittests and integration tests for reports (incomplete)
pchtsp 039cf08
Merge remote-tracking branch 'origin/tsp_report' into tsp_report
pchtsp bdfb141
Modified default location of reports.
ggsdc b2ca5c1
More fixes to tests
ggsdc 778aad2
Modified cornflow dockerfile
ggsdc 68f4989
Modified default location of reports.
ggsdc 824d472
Some print and error catching to get the error on Github actions
ggsdc 4853159
More debugging
ggsdc 3529616
Modified the way the error is built to be able to decode it as a JSON
ggsdc fba7418
The problem was that the destination folder for the files was not cor…
ggsdc 8a2502a
Added test for the PUT of reports
ggsdc a3e5871
Changed the way get one report reports back the name of the report an…
ggsdc f955e62
Fixed status code on failing test
ggsdc c698a17
Fixed error on client test
ggsdc 35913d5
Added tests for base client
ggsdc e4bdf9e
Added some typing
ggsdc ffcef7c
integration tests passing for tsp and timer reports
pchtsp 63363e3
Merge remote-tracking branch 'origin/tsp_report' into tsp_report
pchtsp 06dd07c
added more time to tests for github actions
pchtsp b9a97c5
reports now can be created and edited with a file by the service_user…
pchtsp 8236957
(previous was an incomplete commit)
pchtsp 862f8c4
minor fixes to pass failing tests
pchtsp fe26094
another failing test
pchtsp eba17e4
fixed some errors in tests. some print statements for debugging
pchtsp 9452cbc
Changes to Dockerfile toc reate the reports folder on the container
ggsdc ecdebff
Modified workflows and order of installation of cornflow-client depen…
ggsdc 8a017c9
Undo change on DOCKERFILE
ggsdc 45e2988
Debug log to have the name on the test
ggsdc 4ca157b
Activated debug mode on testing configuration
ggsdc 65eafb2
Added error logs on log in
ggsdc de3f636
Changed name of service user on cornflow integration testing yaml
ggsdc ec91924
Some small changes to tests to have them more organized
ggsdc 7d0e2f5
Merge branch 'develop' into tsp_report
ggsdc 9990309
Merge branch 'refs/heads/develop' into tsp_report
ggsdc 698495a
Merge remote-tracking branch 'origin/tsp_report' into tsp_report
ggsdc 94e871c
take out prints
pchtsp fb529b0
update swagger REST API doc
pchtsp 37cf3a2
graph coloring report
pchtsp a89c67f
fixed all tests
pchtsp 8fbd570
take out hexaly from requirements
pchtsp 6c98216
Fixed errors that caused test to fail
ggsdc ad57525
fix the report schema errors
pchtsp a5aea1a
Bump version for new client alpha
ggsdc 8e51d58
Merge branch 'refs/heads/develop' into tsp_report
ggsdc c1d8803
Updated workflows for publishing
ggsdc 6b9ae3a
Merge branch 'develop' into tsp_report
ggsdc c464839
Bump cornflow and airflow versions for new image building
ggsdc 5a80ae8
Merge remote-tracking branch 'origin/tsp_report' into tsp_report
ggsdc d1beb92
change in where to get the get_cmap function from recent versions of …
pchtsp 74077ba
fixed schema modification for reports
pchtsp 31a2f54
fix: now we do not move the report, we just return the path to it.
pchtsp d055170
Bump cornflow-client version
ggsdc 18871c6
Bump version for new client alpha
ggsdc 495537e
Bump cornflow-client version on requirements file
ggsdc 6845f53
Fixed error on requirements file
ggsdc bae1109
complete example of sudoku
pchtsp 9b044db
changes while testing the windproblem
pchtsp 9621e26
Merge branch 'sudoku' into tsp_report
pchtsp 31c5c06
fixes to cornflowclient + tests for WindProblem
pchtsp 0228868
take out github repo link + bump version of cornflowclient
pchtsp 5767e21
added already deployed of cornflowclient and github link to installat…
pchtsp ec4f332
sudoku changes
pchtsp c4753aa
improve README + filter tests with flag
pchtsp ca1a24d
minor fixes
pchtsp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,25 @@ | ||
import os | ||
from cornflow_client import SolutionCore | ||
from cornflow_client.core.tools import load_json | ||
import pytups as pt | ||
|
||
|
||
class Solution(SolutionCore): | ||
schema = load_json( | ||
os.path.join(os.path.dirname(__file__), "../schemas/output.json") | ||
) | ||
|
||
def get_route(self): | ||
return self.data["route"] | ||
|
||
def get_tour(self): | ||
return pt.TupList(self.get_route()).sorted(key=lambda v: v["pos"]).take("node") | ||
|
||
def get_used_arcs(self): | ||
tour = self.get_tour() | ||
|
||
if len(tour) <= 1: | ||
return pt.TupList() | ||
edges = pt.TupList(zip(tour, tour[1:])) | ||
edges.append((tour[-1], tour[0])) | ||
return edges |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/.quarto/ |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, so the main issue is that this new version of activate dags seems like it does not work properly, or at least I am not able to make it work (for now) on my machine