moodlesolver 2.1.1__tar.gz → 2.2.0__tar.gz

{moodlesolver-2.1.1 → moodlesolver-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moodlesolver
-Version: 2.1.1
+Version: 2.2.0
 Summary: Moodle quiz automation library and MCP server with local OCR
 Author: i-execute
 License: MIT

{moodlesolver-2.1.1 → moodlesolver-2.2.0}/moodlesolver/client.py

@@ -101,12 +101,18 @@ class AsyncTab:
 
     async def next_page(self):
         u0 = await self.url()
+        h0 = await self.evaluate("(() => { const q = document.querySelector('.qtext'); return q ? q.innerText.trim().slice(0, 80) : ''; })()")
+        h0 = (h0.get('result') or '')
         await self.evaluate("(() => { const n = document.querySelector('input[name=next]') || document.querySelector('input[name=finishattempt]'); if (n) n.click(); return n ? 'ok' : 'nonext'; })()")
-        for _ in range(10):
+        for _ in range(12):
             await asyncio.sleep(1)
             u = await self.url()
+            h = await self.evaluate("(() => { const q = document.querySelector('.qtext'); return q ? q.innerText.trim().slice(0, 80) : ''; })()")
+            h = (h.get('result') or '')
             if u != u0 and '[object' not in u:
                 return u
+            if h and h != h0 and u == u0 and '[object' not in u:
+                return u
         return u0
 
     async def qtext(self):
@@ -297,10 +303,10 @@ class AsyncMoodle:
 
     async def dump_question(self, q, quiz_id):
         rec = {'n': q['number'], 'text': q['text'], 'options': [o['label'] for o in q['options']], 'multi': q['multi'], 'timer': q['timer']}
-        p = await self.download_image(f'{self.dumps_dir}/q{quiz_id}_n{q['number']}.jpg')
+        p = await self.download_image('%s/q%s_n%s.jpg' % (self.dumps_dir, quiz_id, q['number']))
         if p:
             rec['image'] = p
-        self.dump(f'q{quiz_id}_n{q['number']}.json', rec)
+        self.dump("q%s_n%s.json" % (quiz_id, q['number']), rec)
         return rec
 
     async def answer_step(self, labels, tab=None):

{moodlesolver-2.1.1 → moodlesolver-2.2.0}/moodlesolver/jsonapi.py

@@ -174,9 +174,24 @@ class JsonAPI:
         st = await self.q.get_state() or {}
         if not (st.get('checked') or st.get('text_inputs') or st.get('selects')):
             return err('E_NOTHING_CHECKED', page=self._page(st), question=st.get('question'))
-        t = self.q.m.pick_tab_nowait('attempt.php') if hasattr(self.q.m, 'pick_tab_nowait') else None
-        fin = await self.q.m.tab.evaluate("(async () => { const n = document.querySelector('input[name=finishattempt], input[name=next]'); if (n) { n.click(); return n.name; } return 'nobtn'; })()")
-        await asyncio.sleep(5)
+        t = await self.q._tab()
+        u0 = st.get('url') or ''
+        fin = await t.evaluate("(async () => { const n = document.querySelector('input[name=finishattempt], input[name=next]'); if (n) { n.click(); return n.name; } return 'nobtn'; })()")
+        for _ in range(15):
+            await asyncio.sleep(1)
+            u = await t.url()
+            if u != u0 and '[object' not in u and 'summary.php' in (u or ''):
+                break
+            if u != u0 and '[object' not in u:
+                break
+        u = await t.url()
+        if u == u0 or '[object' in (u or ''):
+            from .ctx import CtxAPI
+            mm = re.search('cmid=(\d+)', u0)
+            if mm:
+                r = await CtxAPI(self.q.m).resume_attempt(int(mm.group(1)))
+                if r.get('ok'):
+                    t = self.q.m.tab
         st2 = await self.q.get_state() or {}
         if not st2.get('question'):
             st2 = await self._resume() or {}

{moodlesolver-2.1.1 → moodlesolver-2.2.0}/moodlesolver/quizapi.py

@@ -73,17 +73,18 @@ class QuizAPI:
             st['option_images_b64'] = arr2
         return st
 
-    async def set_answer(self, label=None, index=None, labels=None):
+    async def set_answer(self, label=None, index=None, labels=None, checked=None):
         t = await self._tab()
-        if index is not None:
-            r2 = await t.click_answer(index)
-            return {'clicked': 1 if r2 == 'ok' else 0}
         wants = labels if labels else [label] if label else []
-        r = await t.evaluate("(async () => { const ins = [...document.querySelectorAll('.answer input[type=radio], .answer input[type=checkbox]')]; const wants = " + json.dumps([w.lower() for w in wants]) + "; let n = 0; const norm = s => (s || '').replace(/[\\s\\xa0\\u200b\\u200c]+/g, ' ') .trim().toLowerCase(); for (const w of wants) {  const wn = norm(w);  let e = ins.find(x => norm(x.parentElement.textContent) === wn);  if (!e) e = ins.find(x => norm(x.parentElement.textContent)   .startsWith(wn.slice(0, 25)));  if (e && !e.checked) { e.click(); n++; } } return JSON.stringify({clicked: n}); })()")
-        if wants or index is None:
+        if wants:
+            set_mark = 'true' if checked is not False else 'false'
+            r = await t.evaluate("(async () => { const ins = [...document.querySelectorAll('.answer input[type=radio], .answer input[type=checkbox]')]; const wants = " + json.dumps([w.lower() for w in wants]) + "; const setTo = " + set_mark + "; let n = 0; const norm = s => (s || '').replace(/[\\s\\xa0\\u200b\\u200c]+/g, ' ') .trim().toLowerCase(); for (const w of wants) {  const wn = norm(w);  let e = ins.find(x => norm(x.parentElement.textContent) === wn);  if (!e) e = ins.find(x => norm(x.parentElement.textContent)   .startsWith(wn.slice(0, 25)));  if (e) { if (e.type === 'checkbox' && e.checked !== setTo) { e.click(); } else if (e.type === 'radio' && !e.checked) { e.click(); } if (e.type === 'radio' || e.checked === setTo) n++; } } return JSON.stringify({clicked: n}); })()")
             return json.loads(r.get('result') or '{}')
-        r2 = await t.click_answer(index)
-        return {'clicked': 1 if r2 == 'ok' else 0}
+        if index is not None:
+            set_mark = 'true' if checked is not False else 'false'
+            r2 = await t.evaluate(f"(() => {{ const ins = document.querySelectorAll('.answer input[type=radio], .answer input[type=checkbox]'); if (!ins[{index}]) return 'nobtn'; const e = ins[{index}]; if (e.type === 'checkbox') {{ const want = {set_mark}; if (e.checked !== want) e.click(); return e.checked === want ? 'ok' : 'fail'; }} if (e.checked) return 'ok'; e.click(); return e.checked ? 'ok' : 'fail'; }})()")
+            return {'clicked': 1 if r2 == 'ok' else 0}
+        return {'clicked': 0}
 
     async def set_text(self, text, index=0):
         t = await self._tab()

{moodlesolver-2.1.1 → moodlesolver-2.2.0}/moodlesolver.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moodlesolver
-Version: 2.1.1
+Version: 2.2.0
 Summary: Moodle quiz automation library and MCP server with local OCR
 Author: i-execute
 License: MIT

{moodlesolver-2.1.1 → moodlesolver-2.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "moodlesolver"
-version = "2.1.1"
+version = "2.2.0"
 description = "Moodle quiz automation library and MCP server with local OCR"
 readme = "README.md"
 requires-python = ">=3.10"