Skip to content

Commit 1943bdf

Browse files
committed
Merge branch 'develop' of https://github.com/CoderBotOrg/coderbot into develop
2 parents 5cc6f54 + a436e22 commit 1943bdf

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ python3 init.py
3838

3939
Once started, the backend will expose a number of endpoints:
4040

41-
- Legacy API: [localhost:5000/<LEGACY_METHOD>](http://localhost:5000/);
42-
- Legacy JQuery web application: [localhost:5000:/old](http://localhost:5000/old);
41+
- Legacy API: [localhost:5000/`<LEGACY_METHOD>`](http://localhost:5000/);
42+
- Legacy JQuery web application: [localhost:5000/old](http://localhost:5000/old);
4343
- API v2: [localhost:5000/v2](http://localhost:5000/v2);
4444
- New Vue web application: [localhost:5000/](http://localhost:5000/) (assuming a [vue-app](https://github.com/coderbotorg/vue-app) build is placed in the `dist/` folder);
4545
- Swagger UI dynamic documentation of the API v2: [localhost:5000/v2/ui/index.html](http://localhost:5000/v2/ui/index.html) (once you cloned the [swagger-ui](https://github.com/coderbotorg/swagger-ui) repository inside the backend folder).

camera.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ def load_photo_metadata(self):
120120
self._photos = json.load(f)
121121
f.close()
122122
except IOError:
123-
logging.warning("no metadata file")
123+
logging.warning("no metadata file, starting from empty")
124+
self._photos = []
124125

125126
def save_photo_metadata(self):
126127
f = open(PHOTO_METADATA_FILE, "wt")

cnn_models/models.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"generic_slow_high": {"status": 1.0, "image_width": "224", "image_height": "224", "output_layer": "MobilenetV2/Predictions/Reshape_1"}, "generic_fast_low": {"status": 1.0, "image_width": "128", "image_height": "128", "output_layer": "MobilenetV2/Predictions/Reshape_1"}}
1+
{}

photos/.gitkeep

Whitespace-only changes.

photos/metadata.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)