code restructure per kovatch

lib/creator.py → application/creator.py

@@ -1,6 +1,5 @@
-from polymarket.agents.ai.llm.executor import Executor as Agent
-from polymarket.agents.api.polymarket import Polymarket
-from polymarket.agents.data.newspaper import Newspaper
+from application.executor import Executor as Agent
+from connectors.polymarket import Polymarket
 
 
 class Creator:

jobs/scheduler.py → application/cron.py

@@ -1,9 +1,6 @@
 import datetime as dt
 import time
-from polymarket.agents.lib.trade import Trader
-
-from polymarket.agents.lib.history import record_history
-from polymarket.agents.lib.refresh import refresh_trades
+from application.trade import Trader
 
 from scheduler import Scheduler
 from scheduler.trigger import Monday
@@ -25,8 +22,6 @@ def __init__(self):
         super()
         self.trader = Trader()
         self.weekly(Monday(), self.trader.one_best_trade)
-        self.daily(dt.time(hour=12), refresh_trades)
-        self.hourly(dt.time(minute=30), record_history)
 
 
 # TODO: add task objects for generalized schedule management infrastructure

ai/llm/executor.py → application/executor.py

@@ -4,9 +4,9 @@
 from langchain_core.messages import HumanMessage, SystemMessage
 from langchain_openai import ChatOpenAI
 
-from ai.llm import prompts
-from api.gamma import GammaMarketClient
-from polymarket.agents.ai.llm.prompts import Prompter
+from application import prompts
+from connectors.gamma import GammaMarketClient
+from application.prompts import Prompter
 
 
 class Executor:

lib/trade.py → application/trade.py

@@ -1,12 +1,10 @@
-from polymarket.agents.ai.llm.executor import Executor as Agent
-from polymarket.agents.api.polymarket import Polymarket
-from polymarket.agents.data.newspaper import Newspaper
+from application.executor import Executor as Agent
+from connectors.polymarket import Polymarket
 
 
 class Trader:
     def __init__(self):
         self.polymarket = Polymarket()
-        self.newspaper = Newspaper()
         self.agent = Agent()
 
     def one_best_trade(self):

ai/rag/chroma.py → connectors/chroma.py

@@ -5,7 +5,8 @@
 from langchain_chroma import Chroma
 from langchain_openai import OpenAIEmbeddings
 from langchain_community.document_loaders import JSONLoader
-from api.gamma import GammaMarketClient
+
+from connectors.gamma import GammaMarketClient
 
 
 class PolymarketRAG:

api/gamma.py → connectors/gamma.py

@@ -1,15 +1,15 @@
 import httpx
 import json
 
-from api.types import PolymarketEvent
-from api.types import Market
-from api.types import ClobReward
-from api.types import Tag
+from connectors.objects import PolymarketEvent
+from connectors.objects import Market
+from connectors.objects import ClobReward
+from connectors.objects import Tag
 
 
 class GammaMarketClient:
     def __init__(self):
-        self.gamma_url = "https://gamma-api.polymarket.com"
+        self.gamma_url = "https://gamma-polymarket.com"
         self.gamma_markets_endpoint = self.gamma_url + "/markets"
         self.gamma_events_endpoint = self.gamma_url + "/events"
 

data/news/newsapiorg/api.py → connectors/news.py

@@ -2,10 +2,10 @@
 
 from newsapi import NewsApiClient
 
-from data.news.types import Article
+from connectors.objects import Article
 
 
-class API:
+class News:
     def __init__(self) -> None:
         self.configs = {
             "language": "en",

api/types.py → connectors/objects.py

@@ -210,3 +210,19 @@ class SimpleEvent(BaseModel):
     featured: bool
     restricted: bool
     markets: str
+
+
+class Source(BaseModel):
+    id: Optional[str]
+    name: Optional[str]
+
+
+class Article(BaseModel):
+    source: Optional[Source]
+    author: Optional[str]
+    title: Optional[str]
+    description: Optional[str]
+    url: Optional[str]
+    urlToImage: Optional[str]
+    publishedAt: Optional[str]
+    content: Optional[str]

api/polymarket.py → connectors/polymarket.py

@@ -22,15 +22,14 @@
 from py_clob_client.clob_types import OrderArgs
 from py_clob_client.order_builder.constants import BUY
 
-from api.polymarket.types import SimpleMarket
-from api.polymarket.types import SimpleEvent
+from connectors.objects import SimpleMarket, SimpleEvent
 
 load_dotenv()
 
 
 class Polymarket:
     def __init__(self):
-        self.gamma_url = "https://gamma-api.polymarket.com"
+        self.gamma_url = "https://gamma-com"
         self.gamma_markets_endpoint = self.gamma_url + "/markets"
         self.gamma_events_endpoint = self.gamma_url + "/events"
 
@@ -45,8 +44,8 @@ def __init__(self):
         self.exchange_address = "0x4bfb41d5b3570defd03c39a9a4d8de6bd8b8982e"
         self.neg_risk_exchange_address = "0xC5d563A36AE78145C45a50134d48A1215220f80a"
 
-        self._init_api_keys()
-        self._init_approvals(True)
+        # self._init_api_keys()
+        # self._init_approvals(True)
 
     def _init_api_keys(self):
         self.client = ClobClient(
@@ -346,7 +345,7 @@ def test():
 
 
 def gamma():
-    url = "https://gamma-api.polymarket.com"
+    url = "https://gamma-com"
     markets_url = url + "/markets"
     res = httpx.get(markets_url)
     code = res.status_code

connectors/recorder.py

@@ -0,0 +1 @@
+# record the trades placed here

scripts/python/cli.py

@@ -1,15 +1,15 @@
 import typer
 from devtools import pprint
 
-from api.polymarket import Polymarket
-from ai.llm import executor, prompts
-from ai.rag.chroma import PolymarketRAG
-from data.news.newsapiorg.api import API as NewsApiCaller
-from jobs.scheduler import TradingAgent
+from connectors.polymarket import Polymarket
+from application import executor, prompts
+from connectors.chroma import PolymarketRAG
+from connectors.news import News
+from application.cron import TradingAgent
 
 app = typer.Typer()
 polymarket = Polymarket()
-newsapi_client = NewsApiCaller()
+newsapi_client = News()
 polymarket_rag = PolymarketRAG()