moodlesolver 2.0.0__tar.gz → 2.1.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moodlesolver
-Version: 2.0.0
+Version: 2.1.1
 Summary: Moodle quiz automation library and MCP server with local OCR
 Author: i-execute
 License: MIT
@@ -80,7 +80,12 @@ asyncio.run(main())
 Каждый ответ содержит: `page`, `question`, `question_hash`, `qtype`, `options`, `checked` (что реально отмечено на сервере), `selects`, `text_inputs`, `timeleft`, `buttons`, а также:
 
 - `question_image_b64` / `option_images_b64` — картинки в base64 (или ссылки при `image_mode="url"`)
-- `ocr` — локальное превью каждой картинки: `{"formula": "…", "ru": "…", "en": "…"}`
+- `ocr` — локальное превью каждой картинки: `{"formula": "…", "ru": "…", "en": "…"}`, а при `ai_preview=True` ещё `ai_preview` — описание картинок vision-моделью OpenCode (mimo-v2.6-flash-free по умолчанию)
+
+```python
+api = JsonAPI(q, ai_preview=True)          # включить AI-описание картинок
+api = JsonAPI(q, ai_preview=True, ai_model="opencode/longcat-2.5-preview-free")
+```
 
 Подробная схема: `moodlesolver/schema/quiz_protocol.json`.
 

{moodlesolver-2.0.0 → moodlesolver-2.1.1}/README.md

@@ -63,7 +63,12 @@ asyncio.run(main())
 Каждый ответ содержит: `page`, `question`, `question_hash`, `qtype`, `options`, `checked` (что реально отмечено на сервере), `selects`, `text_inputs`, `timeleft`, `buttons`, а также:
 
 - `question_image_b64` / `option_images_b64` — картинки в base64 (или ссылки при `image_mode="url"`)
-- `ocr` — локальное превью каждой картинки: `{"formula": "…", "ru": "…", "en": "…"}`
+- `ocr` — локальное превью каждой картинки: `{"formula": "…", "ru": "…", "en": "…"}`, а при `ai_preview=True` ещё `ai_preview` — описание картинок vision-моделью OpenCode (mimo-v2.6-flash-free по умолчанию)
+
+```python
+api = JsonAPI(q, ai_preview=True)          # включить AI-описание картинок
+api = JsonAPI(q, ai_preview=True, ai_model="opencode/longcat-2.5-preview-free")
+```
 
 Подробная схема: `moodlesolver/schema/quiz_protocol.json`.
 

{moodlesolver-2.0.0 → moodlesolver-2.1.1}/moodlesolver/__init__.py

@@ -5,6 +5,7 @@ from .ctx import CtxAPI
 from .airunner import AIRunner
 from .jsonapi import JsonAPI
 from .vision import ocr_file, make_on_ocr
+from .aipreview import ai_preview, opencode_available
 from .cdn import serve_dumps
 from .mcp_server import main as mcp_main
-__all__ = ['AsyncMoodle', 'AsyncTab', 'CamofoxError', 'parse_page', 'QuizAPI', 'CtxAPI', 'AIRunner', 'JsonAPI', 'mcp_main']
+__all__ = ['AsyncMoodle', 'AsyncTab', 'CamofoxError', 'parse_page', 'QuizAPI', 'CtxAPI', 'AIRunner', 'JsonAPI', 'mcp_main', 'ai_preview', 'opencode_available', 'serve_dumps', 'ocr_file', 'make_on_ocr']

moodlesolver-2.1.1/moodlesolver/aipreview.py

@@ -0,0 +1,26 @@
+import shutil
+import subprocess
+
+OC_DEFAULT_MODEL = "opencode/mimo-v2.6-flash-free"
+
+
+def opencode_available():
+    return shutil.which("opencode") is not None
+
+
+def ai_preview(paths, prompt="Опиши что на картинке, весь текст перепиши",
+               model=OC_DEFAULT_MODEL, timeout=120):
+    if not opencode_available() or not paths:
+        return None
+    cmd = ["opencode", "run", prompt, "--model", model]
+    for p in paths:
+        cmd += ["-f", p]
+    try:
+        out = subprocess.run(cmd, capture_output=True, text=True,
+                             timeout=timeout).stdout.strip()
+    except Exception:
+        return None
+    if not out or "Error" in out.splitlines()[0]:
+        return None
+    lines = [ln for ln in out.splitlines() if not ln.startswith(">")]
+    return "\n".join(lines).strip() or None

{moodlesolver-2.0.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.0.0 → moodlesolver-2.1.1}/moodlesolver/jsonapi.py

@@ -28,8 +28,9 @@ def _qtype(st):
     return 'unknown'
 
 class JsonAPI:
-
-    def __init__(self, quiz_api, on_ocr=None, image_mode='b64', image_base_url=None):
+    def __init__(self, quiz_api, on_ocr=None, image_mode='b64',
+                 image_base_url=None, ai_preview=False,
+                 ai_model=None):
         self.q = quiz_api
         if on_ocr is None:
             from .vision import make_on_ocr
@@ -37,6 +38,9 @@ class JsonAPI:
         self.on_ocr = on_ocr
         self.image_mode = image_mode
         self.image_base_url = image_base_url
+        self.ai = bool(ai_preview)
+        from .aipreview import OC_DEFAULT_MODEL
+        self.ai_model = ai_model or OC_DEFAULT_MODEL
 
     async def handle(self, command):
         c = json.loads(command) if isinstance(command, str) else command
@@ -78,8 +82,6 @@ class JsonAPI:
         return v
 
     async def _ocr_preview(self, st):
-        if not self.on_ocr:
-            return None
         import asyncio as aio
         files = []
         if st.get('question_image_file'):
@@ -88,6 +90,7 @@ class JsonAPI:
             files.append((f, f))
         if not files:
             return None
+        from .vision import _resolve
 
         async def one(name, f):
             ru, en, formula = await aio.gather(aio.to_thread(self.on_ocr, f, 'текст русский'), aio.to_thread(self.on_ocr, f, 'text english'), aio.to_thread(self.on_ocr, f, 'формула'), return_exceptions=True)
@@ -102,6 +105,16 @@ class JsonAPI:
                 out.setdefault('errors', []).append(str(p)[:60])
             else:
                 out[p[0]] = p[1]
+        if self.ai:
+            try:
+                from .aipreview import ai_preview
+                paths = [_resolve(f) for _, f in files]
+                text = await aio.to_thread(ai_preview, paths,
+                                           model=self.ai_model)
+                if text:
+                    out['ai_preview'] = text[:2000]
+            except Exception:
+                pass
         return out or None
 
     async def _select(self, c):

{moodlesolver-2.0.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.0.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.0.0 → moodlesolver-2.1.1}/moodlesolver.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moodlesolver
-Version: 2.0.0
+Version: 2.1.1
 Summary: Moodle quiz automation library and MCP server with local OCR
 Author: i-execute
 License: MIT
@@ -80,7 +80,12 @@ asyncio.run(main())
 Каждый ответ содержит: `page`, `question`, `question_hash`, `qtype`, `options`, `checked` (что реально отмечено на сервере), `selects`, `text_inputs`, `timeleft`, `buttons`, а также:
 
 - `question_image_b64` / `option_images_b64` — картинки в base64 (или ссылки при `image_mode="url"`)
-- `ocr` — локальное превью каждой картинки: `{"formula": "…", "ru": "…", "en": "…"}`
+- `ocr` — локальное превью каждой картинки: `{"formula": "…", "ru": "…", "en": "…"}`, а при `ai_preview=True` ещё `ai_preview` — описание картинок vision-моделью OpenCode (mimo-v2.6-flash-free по умолчанию)
+
+```python
+api = JsonAPI(q, ai_preview=True)          # включить AI-описание картинок
+api = JsonAPI(q, ai_preview=True, ai_model="opencode/longcat-2.5-preview-free")
+```
 
 Подробная схема: `moodlesolver/schema/quiz_protocol.json`.
 

{moodlesolver-2.0.0 → moodlesolver-2.1.1}/moodlesolver.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 README.md
 pyproject.toml
 moodlesolver/__init__.py
+moodlesolver/aipreview.py
 moodlesolver/airunner.py
 moodlesolver/cdn.py
 moodlesolver/client.py

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

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