Merge pull request #35 from polywrap/backend-folder-structure

Backend Folder Restructure
agentcoinorg · Jan 25, 2024 · b9edf0a · b9edf0a
2 parents db0292c + 9853047
commit b9edf0a
Show file tree

Hide file tree

Showing 31 changed files with 44 additions and 45 deletions.
diff --git a/workers/fund_public_goods/api/runs.py b/workers/fund_public_goods/api/runs.py
@@ -1,5 +1,5 @@
 from fund_public_goods.inngest_client import inngest_client
-from fund_public_goods.workers.events import CreateStrategyEvent
+from fund_public_goods.workflows.create_strategy.events import CreateStrategyEvent
 from fund_public_goods.db import client, tables
 from fastapi import APIRouter, HTTPException
 from pydantic import BaseModel

diff --git a/workers/fund_public_goods/api/workers.py b/workers/fund_public_goods/api/workers.py
@@ -1,8 +1,8 @@
-from fund_public_goods.inngest_client import inngest_client
-from fund_public_goods.workers.events import CreateStrategyEvent
-from fund_public_goods.db import client, tables
 from fastapi import APIRouter, HTTPException
 from pydantic import BaseModel
+from fund_public_goods.inngest_client import inngest_client
+from fund_public_goods.workflows.create_strategy.events import CreateStrategyEvent
+from fund_public_goods.db import client, tables
 
 router = APIRouter()
 

diff --git a/workers/fund_public_goods/db/__init__.py b/workers/fund_public_goods/db/__init__.py
@@ -1,3 +1,4 @@
+from .tables import gitcoin
 from .tables import logs
 from .tables import projects
 from .tables import runs

diff --git a/workers/fund_public_goods/db/operations.py → ...rs/fund_public_goods/db/tables/gitcoin.py b/workers/fund_public_goods/db/operations.py → ...rs/fund_public_goods/db/tables/gitcoin.py
@@ -1,7 +1,7 @@
 import datetime
 import json
-from fund_public_goods.gitcoin.models import GitcoinIndexingJob, ProjectApplicationInfo, ProjectInfo
-from .client import create_admin
+from fund_public_goods.lib.gitcoin.models import GitcoinIndexingJob, ProjectApplicationInfo, ProjectInfo
+from fund_public_goods.db.client import create_admin
 
 def upsert_project(app: ProjectInfo):
     db = create_admin()
@@ -19,7 +19,6 @@ def upsert_project(app: ProjectInfo):
         "description": app.data["description"],
         "website": app.data["website"],
     }).execute()
-
 
 def save_application(app: ProjectApplicationInfo):
     db = create_admin()
@@ -119,4 +118,4 @@ def stop_and_mark_job_as_failed(job_id: str, error: object):
             "last_updated_at": datetime.datetime.utcnow().isoformat()
         })
         .eq("id", job_id)
-        .execute())
+        .execute())
diff --git a/workers/fund_public_goods/db/tables/strategy_entries.py b/workers/fund_public_goods/db/tables/strategy_entries.py
@@ -1,5 +1,5 @@
 from supabase import Client
-from fund_public_goods.agents.researcher.models.weighted_project import WeightedProject
+from fund_public_goods.lib.strategy.models.weighted_project import WeightedProject
 
 
 def insert(

diff --git a/workers/fund_public_goods/agents/__init__.py → ...fund_public_goods/lib/gitcoin/__init__.py b/workers/fund_public_goods/agents/__init__.py → ...fund_public_goods/lib/gitcoin/__init__.py
diff --git a/workers/fund_public_goods/gitcoin/models.py → ...s/fund_public_goods/lib/gitcoin/models.py b/workers/fund_public_goods/gitcoin/models.py → ...s/fund_public_goods/lib/gitcoin/models.py
diff --git a/...ers/fund_public_goods/gitcoin/scrapers.py → ...rs/fund_public_goods/lib/gitcoin/utils.py b/...ers/fund_public_goods/gitcoin/scrapers.py → ...rs/fund_public_goods/lib/gitcoin/utils.py
@@ -1,6 +1,6 @@
 import requests
 
-from fund_public_goods.gitcoin.models import RoundInfo, ApplicationInfo
+from fund_public_goods.lib.gitcoin.models import RoundInfo, ApplicationInfo
 
 def fetch_json_from_ipfs(pointer: str) -> dict:
     ipfs_url = f"https://ipfs.io/ipfs/{pointer}"

diff --git a/...ublic_goods/agents/researcher/__init__.py → ...und_public_goods/lib/strategy/__init__.py b/...ublic_goods/agents/researcher/__init__.py → ...und_public_goods/lib/strategy/__init__.py
diff --git a/..._goods/agents/researcher/models/answer.py → ...ublic_goods/lib/strategy/models/answer.py b/..._goods/agents/researcher/models/answer.py → ...ublic_goods/lib/strategy/models/answer.py
diff --git a/...ts/researcher/models/evaluated_project.py → .../lib/strategy/models/evaluated_project.py b/...ts/researcher/models/evaluated_project.py → .../lib/strategy/models/evaluated_project.py
@@ -1,6 +1,6 @@
 from pydantic import BaseModel
-from fund_public_goods.agents.researcher.models.project import Project
-from fund_public_goods.agents.researcher.models.project_evaluation import ProjectEvaluation
+from fund_public_goods.lib.strategy.models.project import Project
+from fund_public_goods.lib.strategy.models.project_evaluation import ProjectEvaluation
 
 class EvaluatedProject(BaseModel):
     project: Project

diff --git a/...goods/agents/researcher/models/project.py → ...blic_goods/lib/strategy/models/project.py b/...goods/agents/researcher/models/project.py → ...blic_goods/lib/strategy/models/project.py
@@ -1,5 +1,5 @@
 from pydantic import BaseModel
-from fund_public_goods.agents.researcher.models.answer import Answer
+from fund_public_goods.lib.strategy.models.answer import Answer
 
 class Project(BaseModel):
     id: str

diff --git a/...s/researcher/models/project_evaluation.py → ...lib/strategy/models/project_evaluation.py b/...s/researcher/models/project_evaluation.py → ...lib/strategy/models/project_evaluation.py
diff --git a/...nts/researcher/models/weighted_project.py → ...s/lib/strategy/models/weighted_project.py b/...nts/researcher/models/weighted_project.py → ...s/lib/strategy/models/weighted_project.py
@@ -1,6 +1,6 @@
 from pydantic import BaseModel
-from fund_public_goods.agents.researcher.models.project import Project
-from fund_public_goods.agents.researcher.models.project_evaluation import ProjectEvaluation
+from fund_public_goods.lib.strategy.models.project import Project
+from fund_public_goods.lib.strategy.models.project_evaluation import ProjectEvaluation
 
 class WeightedProject(BaseModel):
     project: Project

diff --git a/...s/agents/researcher/functions/__init__.py → ...blic_goods/lib/strategy/utils/__init__.py b/...s/agents/researcher/functions/__init__.py → ...blic_goods/lib/strategy/utils/__init__.py
diff --git a/...ts/researcher/functions/assign_weights.py → ...oods/lib/strategy/utils/assign_weights.py b/...ts/researcher/functions/assign_weights.py → ...oods/lib/strategy/utils/assign_weights.py
@@ -2,10 +2,9 @@
 from langchain_core.prompts import ChatPromptTemplate
 from langchain_core.output_parsers import StrOutputParser
 from langchain_core.output_parsers.json import JsonOutputParser
-from fund_public_goods.agents.researcher.models.evaluated_project import EvaluatedProject
 import json
-
-from fund_public_goods.agents.researcher.models.weighted_project import WeightedProject
+from fund_public_goods.lib.strategy.models.evaluated_project import EvaluatedProject
+from fund_public_goods.lib.strategy.models.weighted_project import WeightedProject
 
 assign_weights_prompt_template = """
 You are a specialist in public goods funding. You will receive a list of projects

diff --git a/...researcher/functions/evaluate_projects.py → ...s/lib/strategy/utils/evaluate_projects.py b/...researcher/functions/evaluate_projects.py → ...s/lib/strategy/utils/evaluate_projects.py
@@ -4,11 +4,11 @@
 from langchain_core.output_parsers import StrOutputParser
 from langchain_core.output_parsers.json import JsonOutputParser
 from langchain_openai import OpenAIEmbeddings
-from fund_public_goods.agents.researcher.functions.generate_queries import generate_queries
-from fund_public_goods.agents.researcher.models.evaluated_project import EvaluatedProject
-from fund_public_goods.agents.researcher.models.project import Project
 from langchain.vectorstores.chroma import Chroma
-from fund_public_goods.agents.researcher.models.project_evaluation import ProjectEvaluation
+from fund_public_goods.lib.strategy.utils.generate_queries import generate_queries
+from fund_public_goods.lib.strategy.models.evaluated_project import EvaluatedProject
+from fund_public_goods.lib.strategy.models.project import Project
+from fund_public_goods.lib.strategy.models.project_evaluation import ProjectEvaluation
 
 
 def stringify_projects(projects: list[Project], separator: str) -> str:

diff --git a/.../researcher/functions/generate_queries.py → ...ds/lib/strategy/utils/generate_queries.py b/.../researcher/functions/generate_queries.py → ...ds/lib/strategy/utils/generate_queries.py
diff --git a/workers/fund_public_goods/main.py b/workers/fund_public_goods/main.py
@@ -2,11 +2,11 @@
 from fastapi import FastAPI
 import inngest.fast_api
 from mangum import Mangum
-from .inngest_client import inngest_client
-from fund_public_goods.gitcoin.functions import functions as gitcoin_functions
-from fund_public_goods.workers.functions import functions as worker_functions
-from .api import workers, runs
-from .get_version import router as get_version_router
+from fund_public_goods.inngest_client import inngest_client
+from fund_public_goods.workflows.index_gitcoin.functions import functions as gitcoin_functions
+from fund_public_goods.workflows.create_strategy.functions import functions as worker_functions
+from fund_public_goods.api import workers, runs
+from fund_public_goods.get_version import router as get_version_router
 
 load_dotenv()
 

diff --git a/...ers/fund_public_goods/workers/__init__.py → ...ods/workflows/create_strategy/__init__.py b/...ers/fund_public_goods/workers/__init__.py → ...ods/workflows/create_strategy/__init__.py
diff --git a/...d_public_goods/workers/events/__init__.py → ...kflows/create_strategy/events/__init__.py b/...d_public_goods/workers/events/__init__.py → ...kflows/create_strategy/events/__init__.py
diff --git a/...s/workers/events/create_strategy_event.py → ..._strategy/events/create_strategy_event.py b/...s/workers/events/create_strategy_event.py → ..._strategy/events/create_strategy_event.py
@@ -2,7 +2,7 @@
 from pydantic import BaseModel
 
 class CreateStrategyEvent:
-    name: str = "create_strategy"
+    name: str = "on_create_strategy"
     trigger = inngest.TriggerEvent(event=name)
 
     class Data(BaseModel):

diff --git a/...ublic_goods/workers/functions/__init__.py → ...ows/create_strategy/functions/__init__.py b/...ublic_goods/workers/functions/__init__.py → ...ows/create_strategy/functions/__init__.py
diff --git a/...oods/workers/functions/create_strategy.py → ...ate_strategy/functions/create_strategy.py b/...oods/workers/functions/create_strategy.py → ...ate_strategy/functions/create_strategy.py
@@ -1,19 +1,19 @@
-from fund_public_goods.agents.researcher.functions.assign_weights import assign_weights
-from fund_public_goods.agents.researcher.functions.evaluate_projects import (
+import inngest
+from supabase import Client
+from fund_public_goods.lib.strategy.utils.assign_weights import assign_weights
+from fund_public_goods.lib.strategy.utils.evaluate_projects import (
     evaluate_projects,
 )
-from fund_public_goods.agents.researcher.models.evaluated_project import (
+from fund_public_goods.lib.strategy.models.evaluated_project import (
     EvaluatedProject,
 )
-from fund_public_goods.agents.researcher.models.project import Project
-from fund_public_goods.agents.researcher.models.weighted_project import WeightedProject
-import inngest
+from fund_public_goods.lib.strategy.models.project import Project
+from fund_public_goods.lib.strategy.models.weighted_project import WeightedProject
 from fund_public_goods.db.tables.projects import get_projects
 from fund_public_goods.db.tables.runs import get_prompt
 from fund_public_goods.db.tables.strategy_entries import insert_multiple
-from fund_public_goods.workers.events import CreateStrategyEvent
 from fund_public_goods.db import client, logs
-from supabase import Client
+from fund_public_goods.workflows.create_strategy.events import CreateStrategyEvent
 
 
 def fetch_projects_data(supabase: Client) -> list[Project]:
@@ -45,7 +45,7 @@ def fetch_projects_data(supabase: Client) -> list[Project]:
 
 
 @inngest.create_function(
-    fn_id="on_create_strategy",
+    fn_id="create_strategy",
     trigger=CreateStrategyEvent.trigger,
 )
 async def create_strategy(

diff --git a/workers/fund_public_goods/workflows/index_gitcoin/__init__.py b/workers/fund_public_goods/workflows/index_gitcoin/__init__.py
diff --git a/...d_public_goods/gitcoin/events/__init__.py → ...orkflows/index_gitcoin/events/__init__.py b/...d_public_goods/gitcoin/events/__init__.py → ...orkflows/index_gitcoin/events/__init__.py
diff --git a/...itcoin/events/index_gitcoin_page_event.py → ...itcoin/events/index_gitcoin_page_event.py b/...itcoin/events/index_gitcoin_page_event.py → ...itcoin/events/index_gitcoin_page_event.py
diff --git a/...ublic_goods/gitcoin/functions/__init__.py → ...flows/index_gitcoin/functions/__init__.py b/...ublic_goods/gitcoin/functions/__init__.py → ...flows/index_gitcoin/functions/__init__.py
diff --git a/...s/gitcoin/functions/index_gitcoin_page.py → ...x_gitcoin/functions/index_gitcoin_page.py b/...s/gitcoin/functions/index_gitcoin_page.py → ...x_gitcoin/functions/index_gitcoin_page.py
@@ -2,10 +2,10 @@
 from typing import cast
 import inngest
 from pydantic import parse_obj_as
-from fund_public_goods.gitcoin.models import ApplicationInfo, ProjectApplicationInfo, ProjectInfo, RoundInfo
-from fund_public_goods.gitcoin.events import IndexGitcoinPageEvent
-from fund_public_goods.gitcoin.scrapers import fetch_json_from_ipfs, fetch_project_applications, fetch_rounds
-from fund_public_goods.db.operations import save_application, stop_and_mark_job_as_failed, stop_job, update_job_progress, upsert_project
+from fund_public_goods.lib.gitcoin.models import ApplicationInfo, ProjectApplicationInfo, ProjectInfo, RoundInfo
+from fund_public_goods.workflows.index_gitcoin.events import IndexGitcoinPageEvent
+from fund_public_goods.lib.gitcoin.utils import fetch_json_from_ipfs, fetch_project_applications, fetch_rounds
+from fund_public_goods.db.tables.gitcoin import save_application, stop_and_mark_job_as_failed, stop_job, update_job_progress, upsert_project
 
 PAGE_REQUEST_FREQUENCY_SECONDS = 5 # 10 seconds
 # PAGE_REQUEST_FREQUENCY_SECONDS = 10 # 10 seconds

diff --git a/.../gitcoin/functions/start_index_gitcoin.py → ..._gitcoin/functions/start_index_gitcoin.py b/.../gitcoin/functions/start_index_gitcoin.py → ..._gitcoin/functions/start_index_gitcoin.py
@@ -1,7 +1,7 @@
 import inngest
-from fund_public_goods.gitcoin.events import IndexGitcoinPageEvent
-from fund_public_goods.db.operations import get_non_running_job, is_any_job_running, start_job
-from fund_public_goods.gitcoin.models import GitcoinIndexingJob
+from fund_public_goods.workflows.index_gitcoin.events import IndexGitcoinPageEvent
+from fund_public_goods.db.tables.gitcoin import get_non_running_job, is_any_job_running, start_job
+from fund_public_goods.lib.gitcoin.models import GitcoinIndexingJob
 
 @inngest.create_function(
     fn_id="start_index_gitcoin",

diff --git a/workers/pyproject.toml b/workers/pyproject.toml
@@ -25,7 +25,7 @@ types-requests = "^2.31.0.20240106"
 
 [tool.mypy]
 check_untyped_defs = true
-ignore_missing_imports = true
+ignore_missing_imports = false
 plugins = [
   "pydantic.mypy"
 ]