clean up random print statements

Author: bnmnetp

.gitignore

@@ -33,3 +33,4 @@ _build
 **/test/_static
 bake.log
 WARP.md
+.claude

components/rsptx/db/crud/book.py

@@ -105,7 +105,7 @@ async def get_book_subchapters(course_name: str) -> List[SubChapterValidator]:
         .order_by(Chapter.chapter_num, SubChapter.sub_chapter_num)
     )
     async with async_session() as session:
-        print(query)
+        rslogger.debug(f"{query=}")
         res = await session.execute(query)
         return [SubChapterValidator.from_orm(x) for x in res.scalars().fetchall()]
 

components/rsptx/db/crud/course_attrs.py

@@ -1,7 +1,8 @@
 from sqlalchemy import select
 
-from ..models import CourseAttribute
+from ..models import CourseAttribute, Courses
 from ..async_session import async_session
+from rsptx.logging import rslogger
 
 
 async def fetch_all_course_attributes(course_id: int) -> dict:
@@ -48,27 +49,31 @@ async def copy_course_attributes(basecourse_id: int, new_course_id: int):
     async with async_session() as session:
         res = await session.execute(query)
         for row in res.scalars().fetchall():
-            print(row.attr, row.value)
+            rslogger.debug(f"copy_course_attributes: {row.attr}={row.value}")
             new_attr = CourseAttribute(
                 course_id=new_course_id, attr=row.attr, value=row.value
             )
             session.add(new_attr)
         await session.commit()
 
 
-async def get_course_origin(base_course):
+async def get_course_origin(base_course: str):
     """
-    Retrieve the origin of a given course (base_course)
+    Retrieve the origin (markup system) of a given course by its name.
 
-    :param base_course: str, the name of the base course
-    :return: str, the origin of the course
+    :param base_course: str, the name of the base course (i.e. ``courses.course_name``)
+    :return: str, the value of the ``markup_system`` course attribute, or None if not found
     """
-    query = select(CourseAttribute).where(
-        (CourseAttribute.course_id == base_course)
-        & (CourseAttribute.attr == "markup_system")
+    query = (
+        select(CourseAttribute)
+        .join(Courses, Courses.id == CourseAttribute.course_id)
+        .where(
+            (Courses.course_name == base_course)
+            & (CourseAttribute.attr == "markup_system")
+        )
     )
 
     async with async_session() as session:
         res = await session.execute(query)
         ca = res.scalars().first()
-        return ca.value
+        return ca.value if ca else None

components/rsptx/db/crud/question.py

@@ -638,8 +638,8 @@ async def fetch_questions_for_chapter_subchapter(
             Question.id,
         )
     )
-    print(f"{query=}")
-    print(f"{base_course=},{skipreading=},{from_source_only=},{pages_only=},{owner=}")
+    rslogger.debug(f"{query=}")
+    rslogger.debug(f"{base_course=},{skipreading=},{from_source_only=},{pages_only=},{owner=}")
     async with async_session() as session:
         res = await session.execute(query)
         rslogger.debug(f"{res=}")