Merge pull request #16 from MartinBernstorff/dev/15/require_status_ch…

…ecks_to_pass

dev: require status checks to pass

.devcontainer/devcontainer.json

@@ -17,7 +17,6 @@
                 "ms-python.python",
                 "ms-python.vscode-pylance",
                 "GitHub.vscode-pull-request-github",
-                "ms-vscode.makefile-tools",
                 "github.vscode-github-actions",
                 "SeeLog.python-init-generator",
                 "MichaelCurrin.auto-commit-msg",
@@ -31,7 +30,7 @@
     "features": {
         "ghcr.io/devcontainers/features/github-cli:1": {}
     },
-    "postStartCommand": "make install && gt user pager --disable"
+    "postStartCommand": "gt user pager --disable"
     // Features to add to the dev container. More info: https://containers.dev/features.
     // "features": {},
     // Use 'forwardPorts' to make a list of ports inside the container available locally.

.github/workflows/tests.yml

@@ -38,5 +38,8 @@ jobs:
           cacheFrom: ghcr.io/martinbernstorff/memorymarker-devcontainer-devcontainer:latest
           push: filter
           refFilterForPush: refs/heads/main
+          env: |
+            OMNIVORE_API_KEY=${{ secrets.OMNIVORE_API_KEY }}
+            OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }}
           runCmd:
             make validate_ci

Dockerfile

@@ -28,5 +28,5 @@ COPY pyproject.toml ./
 RUN --mount=type=cache,target=/root/.cache/pip make install
 
 COPY . /app
-RUN pip install -e .
-RUN rm -rf build
+RUN rm -rf cache
+RUN pip install .[tests]

memorymarker/data_access/highlight_providers/hydrator/main.py

@@ -1,11 +1,9 @@
 import re
-from dataclasses import dataclass
-from typing import Callable, Mapping, Sequence
+from typing import Callable, Sequence
 from urllib.request import urlopen
 
 import requests
 from bs4 import BeautifulSoup, NavigableString, Tag
-from iterpy._iter import Iter
 from joblib import Memory
 
 from memorymarker.data_access.highlight_providers.base import (
@@ -103,7 +101,7 @@ def hydrate_highlights(
                     uri=highlight.uri,
                     title=highlight.title,
                     context=context,
-                ),
+                ),  # type: ignore
             )
 
         return hydrated_highlights

memorymarker/data_access/highlight_providers/hydrator/test_hydrator.py

@@ -1,6 +1,6 @@
 from bs4 import BeautifulSoup
 
-from memorymarker.data_access.hydrator.main import ContextParser
+from memorymarker.data_access.highlight_providers.hydrator.main import ContextParser
 
 
 def test_context_parser():

memorymarker/data_access/highlight_providers/hypothesis.py

@@ -8,7 +8,7 @@
 from dotenv import load_dotenv
 from pydantic import BaseModel
 
-from memorymarker.data_access.highlight_sources.base import (
+from memorymarker.data_access.highlight_providers.base import (
     OrphanHighlight,
 )
 

memorymarker/domain/highlights_to_questions.py

@@ -7,7 +7,7 @@
 from langchain.schema import HumanMessage, SystemMessage
 
 import memorymarker.data_access.fileio as fileio
-from memorymarker.data_access.highlight_sources.base import HydratedHighlight
+from memorymarker.data_access.highlight_providers.base import HydratedHighlight
 from memorymarker.domain.prompts_from_string import llmresult_to_qas
 
 load_dotenv()

memorymarker/domain/test_highlights_to_questions.py

@@ -3,7 +3,7 @@
 import pytest
 
 import memorymarker.domain.highlights_to_questions as h2q
-from memorymarker.data_access.highlight_sources.base import HydratedHighlight
+from memorymarker.data_access.highlight_providers.base import HydratedHighlight
 
 
 # create a pytest fixture for the model

memorymarker/presentation/main.py

@@ -4,11 +4,11 @@
 import pytz
 from bs4 import BeautifulSoup
 
-from memorymarker.data_access.highlight_sources.base import HydratedHighlight
-from memorymarker.data_access.highlight_sources.hypothesis import (
+from memorymarker.data_access.highlight_providers.base import HydratedHighlight
+from memorymarker.data_access.highlight_providers.hydrator.main import HighlightHydrator
+from memorymarker.data_access.highlight_providers.hypothesis import (
     HypothesisHighlightGetter,
 )
-from memorymarker.data_access.hydrator.main import HighlightHydrator
 from memorymarker.data_access.persist_questions.markdown import write_qa_prompt_to_md
 from memorymarker.domain.highlights_to_questions import (
     highlights_to_questions,

pyproject.toml

@@ -20,11 +20,12 @@ dependencies = [
   "omnivoreql",
   "pydantic",
   "langchain==0.0.300",
-  "openai",
+  "openai==0.28.0",
   "python-dotenv",
   "pytz",
   "joblib",
   "beautifulsoup4",
+  "iterpy",
 ]
 [project.license]
 file = "LICENSE"