goodmap 0.4.1__py3-none-any.whl → 0.4.3__py3-none-any.whl

goodmap/core_api.py

@@ -46,10 +46,10 @@ def core_pages(
             """Suggest new location"""
             try:
                 suggested_location = request.get_json()
-                suggested_location.update({"UUID": str(uuid.uuid4())})
+                suggested_location.update({"uuid": str(uuid.uuid4())})
                 location = location_model.model_validate(suggested_location)
                 message = (
-                    f"A new location has been suggested under UUID: '{location.UUID}' "
+                    f"A new location has been suggested under uuid: '{location.uuid}' "
                     f"at position: {location.position}"
                 )
                 notifier_function(message)
@@ -72,8 +72,9 @@ def core_pages(
                 )
                 notifier_function(message)
             except Exception as e:
-                return make_response(jsonify({"message": f"Error sending notification : {e}"}), 400)
-            return make_response(jsonify({"message": "Location reported"}), 200)
+                error_message = gettext("Error sending notification")
+                return make_response(jsonify({"message": f"{error_message} : {e}"}), 400)
+            return make_response(jsonify({"message": gettext("Location reported")}), 200)
 
     @core_api.route("/data")
     class Data(Resource):
@@ -102,7 +103,7 @@ def core_pages(
     class GetLocations(Resource):
         def get(self):
             """
-            Shows list of locations with UUID and position
+            Shows list of locations with uuid and position
             """
             query_params = request.args.to_dict(flat=False)
             all_locations = database.get_locations(query_params)

goodmap/data_models/location.py

@@ -5,7 +5,7 @@ from pydantic import BaseModel, Field, create_model, field_validator
 
 class LocationBase(BaseModel, extra="allow"):
     position: tuple[float, float]
-    UUID: str
+    uuid: str
 
     @field_validator("position")
     @classmethod
@@ -17,7 +17,7 @@ class LocationBase(BaseModel, extra="allow"):
         return v
 
     def basic_info(self):
-        return {"UUID": self.UUID, "position": self.position}
+        return {"uuid": self.uuid, "position": self.position}
 
 
 def create_location_model(obligatory_fields: list[tuple[str, Type[Any]]]) -> Type[BaseModel]:

goodmap/db.py

@@ -51,25 +51,25 @@ def get_data(db):
 # get_location
 
 
-def get_location_from_raw_data(raw_data, UUID, location_model):
-    point = next((point for point in raw_data["data"] if point["UUID"] == UUID), None)
+def get_location_from_raw_data(raw_data, uuid, location_model):
+    point = next((point for point in raw_data["data"] if point["uuid"] == uuid), None)
     return location_model.model_validate(point) if point else None
 
 
-def google_json_db_get_location(self, UUID, location_model):
+def google_json_db_get_location(self, uuid, location_model):
     return get_location_from_raw_data(
-        json.loads(self.blob.download_as_text(client=None))["map"], UUID, location_model
+        json.loads(self.blob.download_as_text(client=None))["map"], uuid, location_model
     )
 
 
-def json_file_db_get_location(self, UUID, location_model):
+def json_file_db_get_location(self, uuid, location_model):
     with open(self.data_file_path, "r") as file:
-        point = get_location_from_raw_data(json.load(file)["map"], UUID, location_model)
+        point = get_location_from_raw_data(json.load(file)["map"], uuid, location_model)
         return point
 
 
-def json_db_get_location(self, UUID, location_model):
-    return get_location_from_raw_data(self.data, UUID, location_model)
+def json_db_get_location(self, uuid, location_model):
+    return get_location_from_raw_data(self.data, uuid, location_model)
 
 
 def get_location(db, location_model):

{goodmap-0.4.1.dist-info → goodmap-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: goodmap
-Version: 0.4.1
+Version: 0.4.3
 Summary: Map engine to serve all the people :)
 Author: Krzysztof Kolodzinski
 Author-email: krzysztof.kolodzinski@problematy.pl
@@ -110,7 +110,7 @@ TODO: `obligatory_fields` is a new subsection, start using it in the actual appl
 ```
 - `meta-data` - some special data like 
 ```
-"UUID"
+"uuid"
 ```
 
 You can define the fields in all these subsections. Besides these types of fields, there is no restriction on the number of fields a datapoint can have.

{goodmap-0.4.1.dist-info → goodmap-0.4.3.dist-info}/RECORD

@@ -1,14 +1,14 @@
 goodmap/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 goodmap/core.py,sha256=hOTHrDRzbqkfSeKAoD01lzSoY4W8JwupXlJTwTzcvAU,586
-goodmap/core_api.py,sha256=taWgRhAFa2A_lnpHeVwczghs326cB3fLLMwghhvuZkI,6476
-goodmap/data_models/location.py,sha256=6JMEiPMLCNC445kl7k-PXYiOer1wbNgobXRS4dcOoCA,1054
+goodmap/core_api.py,sha256=wy861bym-OtJV_y65TNJNr_hxUW45bUK0j2Vt96HG1s,6544
+goodmap/data_models/location.py,sha256=ESR4Z_zINIjldJKhlXImMaQrdtUPJBQc6SatpPPJyNQ,1054
 goodmap/data_validator.py,sha256=e_PCc2CTgiEBK6inF_HDX5mb5R8poh3KkcbhyrLrFVA,4086
-goodmap/db.py,sha256=LIecsT6lpg2cKBYxyLbq4WSZ9wXBLaFvmyN4NsJpDk8,3665
+goodmap/db.py,sha256=AJHUP3n29BRjgt6GoGnPtxLNg5TL-KSJhtSZtsZKmGM,3665
 goodmap/formatter.py,sha256=VlUHcK1HtM_IEU0VE3S5TOkZLVheMdakvUeW2tCKdq0,783
 goodmap/goodmap.py,sha256=cPTTyGqajuza3RDlfFuCl8idxy7TFo6LPuANP8hmg7U,1806
 goodmap/templates/admin.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 goodmap/templates/map.html,sha256=eU_h61l404g8e3_wszUokDrOC92bQ1nFl8yGMKRXFww,3820
-goodmap-0.4.1.dist-info/LICENSE.md,sha256=nkCQOR7uheLRvHRfXmwx9LhBnMcPeBU9d4ebLojDiQU,1067
-goodmap-0.4.1.dist-info/METADATA,sha256=c8DsZbEA0or2Le5Y2TL4J0SzLc5rBOJYeS-zWeczCfo,4525
-goodmap-0.4.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-goodmap-0.4.1.dist-info/RECORD,,
+goodmap-0.4.3.dist-info/LICENSE.md,sha256=nkCQOR7uheLRvHRfXmwx9LhBnMcPeBU9d4ebLojDiQU,1067
+goodmap-0.4.3.dist-info/METADATA,sha256=nvPI8Jtcm5s-KrGCABgU5OKgYEui4gjC5B-MKgg26tU,4525
+goodmap-0.4.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+goodmap-0.4.3.dist-info/RECORD,,