Merge branch 'main' into python-version-update

Author: bnmnetp

bookserver/crud.py

@@ -1074,7 +1074,7 @@ async def fetch_one_user_topic_practice(
     async with async_session() as session:
         res = await session.execute(query)
         rslogger.debug(f"{res=}")
-        utp = res.scalars().one_or_none()
+        utp = res.scalars().first()
         return UserTopicPracticeValidator.from_orm(utp)
 
 

bookserver/internal/scheduled_builder.py

@@ -587,7 +587,7 @@ def armv7_builder(
 def verilog_builder(
     file_path, cwd, sphinx_base_path, sphinx_source_path, sphinx_out_path, source_path
 ):
-    # Build the test code with a random verification code.
+    # Preprocess the test code with a random verification code, so that the student's source code won't hae access to the verification code.
     out_list = []
     verification_code = get_verification_code()
     test_file_path = os.path.join(
@@ -612,7 +612,7 @@ def verilog_builder(
         out_list,
     )
 
-    # Compile the source and test code.
+    # Compile the source and preprocessed test code.
     exe_path = file_path + ".exe"
     report_subprocess(
         [
@@ -627,6 +627,11 @@ def verilog_builder(
         out_list,
     )
 
+    # Copy over any test vectors.
+    copy_test_file_to_tmp(
+        file_path, cwd, sphinx_base_path, sphinx_source_path, source_path, ".txt"
+    )
+
     # Run the simulation.
     report_subprocess(
         runguard([exe_path], cwd, memsize_kb=100000),

bookserver/internal/utils.py

@@ -48,7 +48,7 @@ def canonicalize_tz(tstring: str) -> str:
 def make_json_response(
     status: int = status.HTTP_200_OK, detail: Any = None
 ) -> JSONResponse:
-    # Omit the detail if it's none.
+    # content is a required parameter for a JSONResponse
     return JSONResponse(
         status_code=status, content=jsonable_encoder({"detail": detail})
     )

bookserver/routers/books.py

@@ -86,7 +86,7 @@ async def return_static_asset(course, kind, filepath):
         filepath,
     )
     rslogger.debug(f"GETTING: {filepath}")
-    if os.path.exists(filepath):
+    if os.path.exists(filepath) and not os.path.isdir(filepath):
         return FileResponse(filepath)
     else:
         raise HTTPException(404)
@@ -306,8 +306,12 @@ async def serve_page(
     rslogger.debug(f"After user check rs_banner is {show_rs_banner}")
 
     worker_name = os.environ.get("WORKER_NAME", socket.gethostname())
-    # temporary
-    if course_attrs.get("ad_server", "google") == "ethical":
+    if worker_name == "":
+        worker_name = socket.gethostname()
+
+    # This makes serving ethical ads the default, but it can be overridden
+    # by adding a course attribute for the base course to set the ad_server to google
+    if course_attrs.get("ad_server", "ethical") == "ethical":
         serve_google_ad = False
     else:
         serve_google_ad = serve_ad

bookserver/routers/rslogging.py

@@ -267,9 +267,10 @@ async def updatelastpage(
     RS_info: Optional[str] = Cookie(None),
 ):
     if request_data.last_page_url is None:
+        # This really should never be the case, but...
         rslogger.error(f"No data for last page url {request_data}")
         return make_json_response(detail="No Data")
-        # todo:  log request_data, request.args and request.env.path_info
+
     if request.state.user:
         lpd = request_data.dict()
         rslogger.debug(f"{lpd=}")

pyproject.toml

@@ -10,7 +10,7 @@
 # ================
 [tool.poetry]
 name = "bookserver"
-version = "1.3.12"
+version = "1.3.14"
 description = "A new Runestone Server Framework"
 authors = ["Brad Miller <[email protected]>", "Bryan A. Jones <bjones AT ece DOT msstate DOT edu"]
 license = "MIT"