sync server to master #121
Merged
Conversation
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
…lized that the videowriter wasn't working when instantiated correctly due to new codec not supporting alpha values and writing the frames with flipped axes (#107)
* Fixed issue with populating map * Can't put walls on stations
* Documented 2 examples Documented 2 example files to explain the new architecture of the BytespriteFactory implementations. * Documented ByteSprite Documented the ByteSprite file * Finished folder docs Finished the folder documentation for bytesprite. * Removed duplicates Removed duplicate requirements from the requirements.txt * Removed sidebars Removed sidebars that are no longer used. * Removed comment Removed the comment related to sidebars
* Documented 2 examples Documented 2 example files to explain the new architecture of the BytespriteFactory implementations. * Documented ByteSprite Documented the ByteSprite file * Finished folder docs Finished the folder documentation for bytesprite. * Removed duplicates Removed duplicate requirements from the requirements.txt * Removed sidebars Removed sidebars that are no longer used. * Removed comment Removed the comment related to sidebars * Made changes Made requests changes.
JeanAEckelberg
requested review from
JuliaCaesar,
KingPhilip14,
MoodyMan04,
CarseKeeper and
JosiahErnst
JuliaCaesar
approved these changes
Oct 21, 2023
JeanAEckelberg
added a commit
that referenced
this pull request
Jan 8, 2024
* synce server to master (#90) * Base file (#80) Made base file and folder structure. * Game generation tweak (#89) * Tweaked game generation * Tweaked game generation names * Added type * moved to actual function * cleaned up ternary * Added comments * documentation updates --------- Co-authored-by: KingPhilip14 <[email protected]> --------- Co-authored-by: Ian <[email protected]> Co-authored-by: KingPhilip14 <[email protected]> * Create schemas (#92) * Significant progress Created all schema files and made progress in them. * Tried with schemas Tried to fix the schemas. Will need to revisit all changes on this branch. * synce server to master (#90) (#91) * Base file (#80) Made base file and folder structure. * Game generation tweak (#89) * Tweaked game generation * Tweaked game generation names * Added type * moved to actual function * cleaned up ternary * Added comments * documentation updates --------- --------- Co-authored-by: Ian <[email protected]> Co-authored-by: KingPhilip14 <[email protected]> * Fixed private issue Made team_id_uuid its own schema for privacy. --------- Co-authored-by: Jean A. Eckelberg <[email protected]> * Updated models to include necessary relationships and created CRUD operations for the submission table (#102) * Patch for a few things missing (#103) * Updated models to include necessary relationships and created CRUD operations for the submission table * Added error_id * formatting * helped make endpoint more secure * Fixed circular imports (#106) * errors crud (#111) * files for crud tables * Fixed error with missing codec by using new codec, after doing so realized that the videowriter wasn't working when instantiated correctly due to new codec not supporting alpha values and writing the frames with flipped axes (#107) * wip * Please look over with great power and responsibility (#108) * Fixed issue with populating map * Can't put walls on stations * errors crud * Removed old files --------- Co-authored-by: Jean A. Eckelberg <[email protected]> * group_run (#112) * fixed crud error stuff * group run * group_run * fixed stuff * Error api calls (#113) * Error api calls Made api calls that will return a list of errors based on the given submission. The submission is accessed by the id and uuid. * Error line Commented out error line * Submission apis Fixed code for getting a single submission or many submissions based on a given id. * wip (#114) * added mapped tables to models * wip * Made new models Fixed the back populations and models for the database. * Made schemas Fixed the schemas to adapt to the new changes * cruds (#115) * crud team type and crud university done * crud turn table * Database created The database can be generated now! * server specified (#117) * Unit testing (#118) * api tests changes: - tests for movement_controller fixed - added pytest to requirements - changed paths in server.main.py - changed all str for run_time, start_run, and submission_time to datetime - changed SubRunInfoBase to SubmissionRunWRun in submission_schema - few minor changes added: - test file for server.main.py: test_main.py * fixes to test_main.py changes: - changed class Configs in bases to model_config, which is a dict of from_attributes: True added: - data in byte_server.db - test for data in test_main.py * Endpoints (#119) * wip * endpoints * sync server to master (#121) * Fixed error with missing codec by using new codec, after doing so realized that the videowriter wasn't working when instantiated correctly due to new codec not supporting alpha values and writing the frames with flipped axes (#107) * Please look over with great power and responsibility (#108) * Fixed issue with populating map * Can't put walls on stations * Folder docs complete (#109) * Documented 2 examples Documented 2 example files to explain the new architecture of the BytespriteFactory implementations. * Documented ByteSprite Documented the ByteSprite file * Finished folder docs Finished the folder documentation for bytesprite. * Removed duplicates Removed duplicate requirements from the requirements.txt * Removed sidebars Removed sidebars that are no longer used. * Removed comment Removed the comment related to sidebars * Made requested changes (#110) * Documented 2 examples Documented 2 example files to explain the new architecture of the BytespriteFactory implementations. * Documented ByteSprite Documented the ByteSprite file * Finished folder docs Finished the folder documentation for bytesprite. * Removed duplicates Removed duplicate requirements from the requirements.txt * Removed sidebars Removed sidebars that are no longer used. * Removed comment Removed the comment related to sidebars * Made changes Made requests changes. --------- Co-authored-by: Ian <[email protected]> * Updated main.py testing (#120) * Updated main.py testing Added the new test for reading by submissions. * Removing print statements Just removed print statements for unit testing * added documentation (#122) * Server testing (#123) * testing submissions + server changes changed: - create method parameters flipped - create arguments in main.py flipped for submission - submission.py uses TimeStamp, changed from DateTime - changed file_txt in submission_base from str to bytes - changed file name from test_main.py to test_submission.py added: - timestamp.py, class to add timezone to datetime - test_team.py base * fixes to server + test_team changes: - flipped parameters in create method of crud_team - changed main.py team response_model to TeamIdSchema - changed main.py team_uuid to str - changed team_uuid to str throughout server added: - test for team post in test_team.py * server tests added: - test_group_run - test_run - test_team_types - test_university changes: - fixed some gets in main.py - group run model start_run from datetime to timestamp - run model run_time from datetime to timestamp - added results to run_base.py - added eligible to team_type_base.py - added results to test_submission.py - added .db to .gitignore * Create test_leaderboard.py * Update test_leaderboard.py changed formatting of expected json result * Fixed several issues and added eager loading (#125) * changed names and removed group_teams * Changes by moody * Added eager loading options and added them utilized them for tournaments * Visualizer modification (#128) * Created properties for visualiser instance variables * Implemented properties for visualiser * Client rewrite (#131) * wip * wip * Done Should be done with the start of the utils * wip * wip * changed to run schema without group run * fixes to unit tests (#124) changes: - test_submission.py json - test_leaderboard.py json - test_group_run.py json - run_schema_wo_group_run.py import - group_teams_schema.py imports deleted: - test_run.py - test database * changes from last time * taking in group_run_id for get leaderboard * main file fixes * Main file changes Added some arguments to the main.py file * Added Leaderboard Builder Added methods to help collect the info needed for building the leaderboard * GR command Added a new command to help with testing for the future. * fixing client rewrite * Client testing Started testing code for the client methods. Will need to revisit soon to fix the errors that are occurring. * Registration works now * Passed seed into generation * Large updates Finding solutions to client problems and testing the client utils. * Update crud_submission.py (#130) added: - get _latest_submission method - gets all teams latest submissions - runs with joining on submission_id * Client utils update Added getting a sum of a team's score * Client Runner progress Made progress on the client runner. Will need to fix some errors * client_runner fixes * fixes to visualizer_runner * updated visualizer_loop * work on client and visualizer runners * updated client and runners * fix to saving video changed in main.py: - self.playback_speed = 10 to self.playback_speed = 10.0 * Small changes Removed comments and unused code * Updates Added a small null handling and added a message in the external runner * Continued work on Client Runner and config file for Client Runner * fixed tournament id error * migrated to postgres * Server update Tested the switch to postgres and removed the pygame support text * Client registration and submission fix Tested and fixed client registration and submission to now show traceback error messages and show exactly what went wrong * migrated back to sqlite * fixed some issues fixed: - allowing numbers less than 1 for playback speed in visualizer deleted: - -server argument in visualizer (did nothing now) * Updated gitignore Added temp folders to gitignore * Used decorators and Result struct * Added Result Example * Changes by moody * error fixing * Team Type update Updated the team types in the client runner. Updated gitignore * Eligible update Fixed bool error * fixes some leaderboard stuff * fixed team register problem fixed issue with when registering a team with the same name as a pre-existing team name, that the error provided would return that team's vID (no good) * fixed details and runs in stats now returns that submission has no details/runs when the list of details/runs for a submission is zero (will need some more testing) * Leaderboard commands Fixed some leaderboard commands to work properly and give proper error messages * Visualizer bat update Removed -server in the bat command. Updated gitignore to properly ignore temp folders * Update .gitignore Added out.mp4 to the gitignore * Visualizer update Default speed for visualizer runner is 2x speed. Changed '... leaderboard -leaderboard_id' to '... leaderboard -id' * Fixed local time to utc time * Deleted unused Deleted unused code that was from the original database * Sped up tournament list retrieval --------- Co-authored-by: JuliaCaesar <[email protected]> Co-authored-by: Gunnar Moody <[email protected]> Co-authored-by: Jean A. Eckelberg <[email protected]> Co-authored-by: Gunnar Moody <[email protected]> Co-authored-by: CarseKeeper <[email protected]> * Documentation (#133) * temporary documentation * finished up what's left of temporary documentation * Updating models Updated docs for models * Index update Updated the index page to give credit to jean and those that contributed to the project * Crud module documentation Added documentation to the entire crud module * Documented models module Added documentation to the models module. * Formatting Changed the formatting of explaining related tables in the models module * Unit test docs Documented the unit testing * Server module documented Added the documentation to the server module * Visualizer docs Started updating and making docs for all methods in the visualizer * Button update Button class update * Requested changes Made the requested changes to the docs * Update log_reader.py Added a doc string * Typo Fixed typo --------- Co-authored-by: JuliaCaesar <[email protected]> * removed sidebars.py --------- Co-authored-by: Ian <[email protected]> Co-authored-by: KingPhilip14 <[email protected]> Co-authored-by: JuliaCaesar <[email protected]> Co-authored-by: CarseKeeper <[email protected]> Co-authored-by: Gunnar Moody <[email protected]> Co-authored-by: JosiahErnst <[email protected]> Co-authored-by: JuliaCaesar <[email protected]> Co-authored-by: Gunnar Moody <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Approve this, these are adding the missing commits from the Master branch to the server branch