Merge branch 'main' into beta

Author: gluap

DisplayCase/SlideOnDisplay/SpecialVersions/OBS-Display-A-002_HeatSetInsert_Display_Bottom_v0.1.0 v1 oversize.f3d

@@ -3,4 +3,5 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y openscad
 ADD . /case
 RUN pip3 install -e /case/customizer/
 ENV LOG_LEVEL=info
+ENV CUSTOMIZER_THREADS=6
 ENV MODULE_NAME=obs_case_customizer.app

DisplayCase/SlideOnDisplay/SpecialVersions/OBS-Display-A-002_HeatSetInsert_Display_Bottom_v0.1.0 v1 oversize_bottom.stl

@@ -10,6 +10,17 @@ If you encounter any problems or have feature requests, please open an issue on
 GitHub. If you need assistance related to the contents of this repository,
 please ask in the [project forums](https://forum.openbikesensor.org).
 
+## Cloning
+If you want to build your own case using openscad instead of using the
+readymade exports or if you want to start the customizer be aware
+that you need to clone including git submodules:
+
+```
+git clone --recursive https://github.com/openbikesensor/OpenBikeSensor3DPrintableCase
+# ... or if you forgot the --recursive argument, you can run this in the
+# repository's directory later:
+git submodule update --init --recursive
+```
 
 ## About the files
 
@@ -349,9 +360,11 @@ OpenSCAD is a special case of course: Here submitting `.stl` (for now) and the
 
 ### Customizer webservice
 
-To run the customizer webservice you run it from the dockerfile:
+To run the customizer webservice you run it from the dockerfile (and be sure
+that you cloned the repo recursively before building the cointainer:
 
 ```
+git submodule update --init --recursive
 docker build . -t customizer
 docker run --rm -p 8001:80 customizer 
 ```

DisplayCase/SlideOnDisplay/SpecialVersions/OBS-Display-A-002_HeatSetInsert_Display_Bottom_v0.1.0 v1 oversize_top.stl

@@ -24,6 +24,7 @@
     packages=setuptools.find_packages(where="src"),
     python_requires=">=3.6",
     install_requires=[
+        "aiofiles",
         "fastapi",
         "python-multipart",
         "jinja2",

Dockerfile

@@ -24,7 +24,7 @@
 from websockets.exceptions import ConnectionClosed
 
 THREADS = int(os.environ.get('CUSTOMIZER_THREADS', 1))
-TIMEOUT = int(os.environ.get('CUSTOMIZER_JOB_TIMEOUT', 1200))
+TIMEOUT = int(os.environ.get('CUSTOMIZER_JOB_TIMEOUT', 2400))
 QUEUESIZE = int(os.environ.get('CUSTOMIZER_QUEUE_LENGTH', 20))
 TEMPLATEDIR = pkg_resources.resource_filename(__name__, 'templates')
 
@@ -71,10 +71,19 @@ def field_type(entry, default_value):
         return "file"
     elif isinstance(default_value, bool):
         return "bool"
+    if entry == "parts_list":
+        return "parts_list"
     else:
         return "string"
 
 
+def all_parts():
+    return [*ALL_PARTS, *[f"logo/CustomLogo/MainCase{l}-{inv}-{mn}"
+                          for l in ["", "Lid"]
+                          for inv in ["inverted", "normal"]
+                          for mn in ["main", "highlight"]]]
+
+
 templates.env.filters['field_type'] = field_type
 
 
@@ -90,9 +99,9 @@ def models(root):
 
 async def queue_runner():
     while True:
-        fun, arg = await queue.get()
-        logging.info(f"running {arg}")
-        await fun(arg)
+        fun, kwargs = await queue.get()
+        logging.info(f"running {kwargs}")
+        await fun(**kwargs)
 
 
 @app.on_event('startup')
@@ -175,12 +184,10 @@ def package_to_zip(source: Path, target: Path):
                 zf.write(name, zipped_name)
 
 
-async def run_job(uid, parts=None):
+async def run_job(uid=None, parts=None):
     global job_durations
     starttime = datetime.datetime.now()
 
-    if parts == None:
-        parts = ALL_PARTS
     dir_to_work = Path(tempfile.gettempdir()) / uid
     logfile = dir_to_work / "log.txt"
     variables_file = dir_to_work / "variables.json"
@@ -192,6 +199,16 @@ async def run_job(uid, parts=None):
         "parts": parts,
         "status": "working",
     }
+
+    if parts == None:
+        parts = ALL_PARTS
+        if job_config.use_custom_logo:
+            parts.extend([f"logo/CustomLogo/MainCase{l}-{inv}-{mn}"
+                          for l in ["", "Lid"]
+                          for inv in ["inverted", "normal"]
+                          for mn in ["main", "highlight"]])
+            info["parts"] = parts
+
     write_info_json = lambda: json.dump(info, info_file.open("wt"))
 
     with tempfile.TemporaryDirectory() as temp:
@@ -202,13 +219,6 @@ async def run_job(uid, parts=None):
         await copy_build_files_to_build_dir(dir_to_work, temp, job_config.use_custom_logo)
 
         try:
-            if job_config.use_custom_logo:
-                parts.extend([f"logo/CustomLogo/MainCase{l}-{inv}-{mn}"
-                              for l in ["", "Lid"]
-                              for inv in ["inverted", "normal"]
-                              for mn in ["main", "highlight"]])
-                info["parts"] = parts
-                write_info_json()
 
             make_targets = [f'export/{name}.stl' for name in parts]
 
@@ -282,6 +292,7 @@ async def _as_form(**data):
 @as_form
 class CustomVariables(BaseModel):
     use_custom_logo: bool = True
+    fix_svg: bool = False
     MainCase_back_rider: bool = True
     MainCase_top_rider: bool = True
     MainCase_back_rider_cable: bool = True
@@ -313,7 +324,8 @@ class RunningJob(CustomVariables):
 def form_get(request: Request):
     # TODO: Switch to CustomVariables.schema for the generation of the <form>
     variables = CustomVariables()
-    fields = [("main_case_logo_svg", ""), ("main_case_lid_logo_svg", ""), *variables.dict().items()]
+    fields = [("main_case_logo_svg", ""), ("main_case_lid_logo_svg", ""), ("parts_list", all_parts()),
+              *variables.dict().items()]
     return templates.TemplateResponse('customizer.html', context={'request': request, 'fields': fields})
 
 
@@ -371,7 +383,10 @@ async def jobstate(websocket: WebSocket, uid: uuid.UUID):
 async def form_post(request: Request,
                     main_case_logo_svg: Optional[bytes] = File(None),
                     main_case_lid_logo_svg: Optional[bytes] = File(None),
+                    parts_list: Optional[list] = None,
                     variables: CustomVariables = Depends(CustomVariables.as_form)):
+    if set(parts_list) - set(all_parts()):
+        raise HTTPException(status_code=400, detail="Only valid parts can be generated")
     uid = str(uuid.uuid4())
     work_dir = Path(tempfile.gettempdir()) / uid
     logging.info(work_dir)
@@ -395,7 +410,7 @@ async def form_post(request: Request,
     variables_json_file.open("w").write(variables.json())
 
     try:
-        queue.put_nowait((run_job, uid))
+        queue.put_nowait((run_job, dict(uid=uid, parts=parts_list)))
     except asyncio.QueueFull:
         return HTTPException(status_code=503, detail="Queue is full, please try again later")
 

README.md

@@ -34,6 +34,12 @@
                 <input type="checkbox" {{'checked="checked"' if value else ''}} name="{{entry}}" id="{{entry}}" />
             {% elif ft == "file" %}
                 <input type="file" name="{{entry}}" id="{{entry}}" accept="image/svg+xml"/>
+            {% elif ft == "parts_list" %}
+                <select name="parts_list" size="{{ value|length }}"multiple>
+                    {% for part in value %}
+                    <option value="{{part}}" selected>{{part}}</option>
+                    {% endfor %}
+                </select>
             {% else %}
                 <input type="text" title="{{entry}}" name="{{entry}}" id="{{entry}}"  value="{{value}}"/>
             {% endif %}

customizer/setup.py

@@ -133,3 +133,13 @@ module ScrewHoleM3(depth, head_depth=0, elongation=0) {
     elongation=elongation
   );
 }
+
+module load_svg(filename) {
+  // some SVG produce strange geometry. This is a bit slower but fixes the issues.
+  if (fix_svg) {
+    offset(delta = epsilon) import(filename);
+  }
+  else {
+    import(filename);
+  }
+}

customizer/src/obs_case_customizer/app.py

@@ -577,7 +577,7 @@ if (logo_generate_templates) {
     mirror([0, 1, 0])
     rotate([0, 0, -90])
     translate([0, -72-72, 0])
-    import(str("../../logo/", logo_name, "/MainCase.svg"));
+    load_svg(str("../../logo/", logo_name, "/MainCase.svg"));
   }
 }