moodlesolver 2.1.0__tar.gz → 2.1.1__tar.gz

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

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

{moodlesolver-2.1.0 → moodlesolver-2.1.1}/moodlesolver/ctx.py

@@ -95,13 +95,13 @@ class CtxAPI:
         d['files'] = []
         if with_resources:
             for r in d['resources']:
-                p = f'res_{r['cmid']}.bin'
+                p = f"res_{r['cmid']}.bin"
                 try:
                     got = await self.download_resource(r['cmid'], p)
                     if got.get('file'):
                         d['files'].append(got['file'])
                 except Exception as e:
-                    d['files'].append(f'error:{r['cmid']}:{str(e)[:40]}')
+                    d['files'].append("error:%s:%s" % (r['cmid'], str(e)[:40]))
         p = path or f'course_{course_id}.json'
         with open(p, 'w') as f:
             json.dump(d, f, ensure_ascii=False, indent=1)
@@ -124,3 +124,31 @@ class CtxAPI:
 
     async def search_courses(self, query):
         return [c for c in await self.get_courses() if query.lower() in c['name'].lower()]
+
+    async def get_guide(self, quiz_cmid, path=None):
+        return await self._get_guide(quiz_cmid, path)
+
+    async def _get_guide(self, quiz_cmid, path=None):
+        for course in await self.get_courses():
+            secs = await self.get_course_sections(course['id'])
+            for s in secs:
+                names = [i for i in s.get('items', [])]
+                quiz = next((i for i in names if i.get('cmid') == str(quiz_cmid)), None)
+                if not quiz:
+                    continue
+                import re as _re
+                m = _re.search(r'(\d+)', quiz.get('name') or '')
+                num = m.group(1) if m else ''
+                guide = next((i for i in names
+                              if 'етодичка' in (i.get('name') or '')
+                              and num and num in (i.get('name') or '')), None)
+                if guide:
+                    gm = _re.search(r'id=(\d+)', guide.get('href') or '')
+                    if gm:
+                        p = path or f'guide_{num}.pdf'
+                        r = await self.download_resource(int(gm.group(1)), p)
+                        return {'ok': True, 'quiz': quiz.get('name'),
+                                'guide': guide.get('name'),
+                                'cmid': int(gm.group(1)), 'file': p,
+                                'bytes': r.get('bytes')}
+        return {'error': 'guide not found'}

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

@@ -65,10 +65,11 @@ class QuizAPI:
                 self.m.dump('q_image.b64', arr[0])
                 st['question_image_file'] = 'q_image.b64'
                 st['question_image_b64'] = arr[0]
-            arr2 = await t.opts_b64()
-            for i, b in enumerate(arr2):
-                self.m.dump(f'opt_image_{i}.b64', b)
-                st.setdefault('option_image_files', []).append(f'opt_image_{i}.b64')
+        arr2 = await t.opts_b64()
+        for i, b in enumerate(arr2):
+            self.m.dump(f'opt_image_{i}.b64', b)
+            st.setdefault('option_image_files', []).append(f'opt_image_{i}.b64')
+        if arr2:
             st['option_images_b64'] = arr2
         return st
 
@@ -115,9 +116,9 @@ class QuizAPI:
                         break
         if not t:
             return {'error': 'no summary'}
-        r = await t.evaluate("var b = [...document.querySelectorAll('form button[type=submit]')].find(x => x.textContent.includes('Отправить всё')); if (b) { b.click(); return 'sub'; } return 'nobtn'")
+        r = await t.evaluate("(() => { const b = [...document.querySelectorAll('form button[type=submit]')].find(x => x.textContent.includes('Отправить всё')); if (b) { b.click(); return 'sub'; } return 'nobtn'; })()")
         await asyncio.sleep(4)
-        r2 = await t.evaluate("var b = [...document.querySelectorAll('form button[type=submit]')].find(x => x.textContent.includes('Отправить всё и завершить тест')); if (b) { b.click(); return 'done'; } return 'noconfirm'")
+        r2 = await t.evaluate("(() => { const b = [...document.querySelectorAll('form button[type=submit]')].find(x => x.textContent.includes('Отправить всё и завершить тест')); if (b) { b.click(); return 'done'; } return 'noconfirm'; })()")
         return r2.get('result')
 
     async def get_result(self, quiz_id):

{moodlesolver-2.1.0 → moodlesolver-2.1.1}/moodlesolver/vision.py

@@ -43,10 +43,21 @@ def _resolve(path, dumps_dir=None):
     if not os.path.exists(p) and dumps_dir:
         p = os.path.join(dumps_dir, path)
     if not os.path.exists(p):
-        for root in ('/tmp',):
-            c = os.path.join(root, path)
-            if os.path.exists(c):
-                return c
+        c = os.path.join('/tmp', path)
+        if os.path.exists(c):
+            p = c
+    if os.path.exists(p) and p.endswith('.b64'):
+        import base64
+        try:
+            raw = open(p, 'rb').read()
+            data = base64.b64decode(raw)
+            if data[:4] == b'\x89PNG' or data[:2] == b'\xff\xd8':
+                png = '/tmp/ocr_' + os.path.basename(p)[:-4] + '.png'
+                with open(png, 'wb') as f:
+                    f.write(data)
+                return png
+        except Exception:
+            pass
     return p
 
 def ocr_file(path, prompt=None, dumps_dir=None):

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

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

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

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