feat/change to newsapi call

packages/packages.json

@@ -3,10 +3,10 @@
         "contract/valory/fpmm_deterministic_factory/0.1.0": "bafybeigjfuahxhb2y4q5ueayry55boaojcryoamwr6fshgayf5s762vpl4",
         "contract/valory/wxdai/0.1.0": "bafybeidalocwbhmbto6ii6adldtpcughtdt6j3v4tv36utevjk2wrdyqie",
         "contract/valory/fpmm/0.1.0": "bafybeiai2ruj27nnglvn7yc5atojyojo3fkmofw6wrjgz2ybps2uwdizx4",
-        "skill/valory/market_creation_manager_abci/0.1.0": "bafybeifs4rcj56jgenlu5lkn5jkovhz3tri24r5gfuwtcr74y23fd3in7a",
-        "skill/valory/market_maker_abci/0.1.0": "bafybeihbxegtl7hsus7osk746myb5ygctteyca2pkcn25eciieyapbjwje",
-        "agent/valory/market_maker/0.1.0": "bafybeic6bql4ola6dsbkhjvozrrmpsiw2nlmh2gsacegwi5ltda4nohjom",
-        "service/valory/market_maker/0.1.0": "bafybeibcdrtxwchfnsr2xelkiul3xz6cz2cdadcdd5xquh422yjtj2pm3a"
+        "skill/valory/market_creation_manager_abci/0.1.0": "bafybeihxjaotedw6oxo2uixz7tgpjvr4iq7mxdvacvxlnmlfrhskzgiwt4",
+        "skill/valory/market_maker_abci/0.1.0": "bafybeidt6h6oprlfmn2ajwn35hm5rmrvt3nrclewdlzvighd5pwkic6zoa",
+        "agent/valory/market_maker/0.1.0": "bafybeicabwx66tzzm7zsxrgfrv5oy2nvrrn4tmjjn4o2jd6dsj2jrjcbmq",
+        "service/valory/market_maker/0.1.0": "bafybeidcbhwrhjwawp7f6b467pcrq66aedayfhx7jburaiolomk5ozvdvu"
     },
     "third_party": {
         "protocol/valory/contract_api/1.0.0": "bafybeidgu7o5llh26xp3u3ebq3yluull5lupiyeu6iooi2xyymdrgnzq5i",

packages/valory/agents/market_maker/aea-config.yaml

@@ -38,9 +38,9 @@ protocols:
 skills:
 - valory/abstract_abci:0.1.0:bafybeieh4ei3qdelmacnm7vwq57phoewgumr3udvxt6pybmuggwc3yk65q
 - valory/abstract_round_abci:0.1.0:bafybeiar2yhzxacfe3qqamqhaihtlcimquwedffctw55sowx6rac3cm3ui
-- valory/market_maker_abci:0.1.0:bafybeihbxegtl7hsus7osk746myb5ygctteyca2pkcn25eciieyapbjwje
+- valory/market_maker_abci:0.1.0:bafybeidt6h6oprlfmn2ajwn35hm5rmrvt3nrclewdlzvighd5pwkic6zoa
 - valory/registration_abci:0.1.0:bafybeieu7vq3pyns4t5ty6u3sbmpkd7yznpg3rmqifoz3jhy7pmqyg3w6q
-- valory/market_creation_manager_abci:0.1.0:bafybeifs4rcj56jgenlu5lkn5jkovhz3tri24r5gfuwtcr74y23fd3in7a
+- valory/market_creation_manager_abci:0.1.0:bafybeihxjaotedw6oxo2uixz7tgpjvr4iq7mxdvacvxlnmlfrhskzgiwt4
 - valory/reset_pause_abci:0.1.0:bafybeiameewywqigpupy3u2iwnkfczeiiucue74x2l5lbge74rmw6bgaie
 - valory/termination_abci:0.1.0:bafybeif2zim2de356eo3sipkmoev5emwadpqqzk3huwqarywh4tmqt3vzq
 - valory/transaction_settlement_abci:0.1.0:bafybeic3tccdjypuge2lewtlgprwkbb53lhgsgn7oiwzyrcrrptrbeyote

packages/valory/services/market_maker/service.yaml

@@ -7,7 +7,7 @@ license: Apache-2.0
 fingerprint:
   README.md: bafybeibwz3af6326msp4h3kqehijvmyhaytvyfbo3o2npc2w4b6zrg6pfq
 fingerprint_ignore_patterns: []
-agent: valory/market_maker:0.1.0:bafybeic6bql4ola6dsbkhjvozrrmpsiw2nlmh2gsacegwi5ltda4nohjom
+agent: valory/market_maker:0.1.0:bafybeicabwx66tzzm7zsxrgfrv5oy2nvrrn4tmjjn4o2jd6dsj2jrjcbmq
 number_of_agents: 1
 deployment:
   agent:

packages/valory/skills/market_creation_manager_abci/behaviours.py

@@ -749,6 +749,7 @@ def _sender_act(self) -> Generator:
                     topics=self.params.topics,
                     num_questions=num_questions,
                     resolution_time=resolution_time,
+                    use_specific_topic=self.params.create_markets_flag
                 )
                 mech_tool_output = mech_tool_propose_questions.run(**tool_kwargs)[0]  # type: ignore
                 mech_tool_output_json = json.loads(mech_tool_output)

packages/valory/skills/market_creation_manager_abci/propose_questions.py

@@ -27,7 +27,7 @@
 import json
 import random
 import uuid
-from datetime import datetime, timezone
+from datetime import datetime, timezone, timedelta
 from typing import Any, Callable, Dict, List, Optional, Tuple
 
 # import anthropic
@@ -42,6 +42,8 @@
 
 
 NEWSAPI_TOP_HEADLINES_URL = "https://newsapi.org/v2/top-headlines"
+NEWSAPI_EVERYTHING_URL = "https://newsapi.org/v2/everything"
+
 NEWSAPI_DEFAULT_NEWS_SOURCES = [
     "bbc-news",
     "bbc-sport",
@@ -307,15 +309,30 @@ def format_utc_timestamp(utc_timestamp: int) -> str:
 
 
 def gather_articles(
-    news_sources: List[str], newsapi_api_key: str
+        news_sources: List[str], newsapi_api_key: str,
+        topics=None
 ) -> Optional[List[Dict[str, Any]]]:
     """Gather news from NewsAPI (top-headlines endpoint)"""
+
     headers = {"X-Api-Key": newsapi_api_key}
-    parameters = {
-        "sources": ",".join(news_sources),
-        "pageSize": "100",  # TODO: pagination
-    }
-    url = NEWSAPI_TOP_HEADLINES_URL
+
+    if topics is not None:
+        from_date = (datetime.now() - timedelta(days=2)).strftime('%Y-%m-%d')
+
+        parameters = {
+            "sources": ",".join(news_sources),
+            "pageSize": "100",
+            "q": ",".join(topics),
+            "from": from_date
+        }
+        url = NEWSAPI_EVERYTHING_URL
+
+    else:
+        parameters = {
+            "sources": ",".join(news_sources),
+            "pageSize": "100",  # TODO: pagination
+        }
+        url = NEWSAPI_TOP_HEADLINES_URL
     response = requests.get(
         url=url,
         headers=headers,
@@ -419,8 +436,13 @@ def run(**kwargs) -> Tuple[Optional[str], Optional[Dict[str, Any]], Any, Any]:
         latest_questions_string = "\n".join(latest_questions)
 
         # Gather recent news articles from NewsAPI
+        use_specific_topic = kwargs.get("use_specific_topic")
         news_sources = kwargs.get("news_sources", NEWSAPI_DEFAULT_NEWS_SOURCES)
-        articles = gather_articles(news_sources, kwargs["api_keys"]["newsapi"])
+        topics = kwargs.get("topics")
+        if use_specific_topic:
+            articles = gather_articles(news_sources, topics, kwargs["api_keys"]["newsapi"])
+        else:
+            articles = gather_articles(news_sources, kwargs["api_keys"]["newsapi"])
 
         if articles is None:
             return (

packages/valory/skills/market_creation_manager_abci/skill.yaml

@@ -10,13 +10,13 @@ aea_version: '>=1.0.0, <2.0.0'
 fingerprint:
   .gitignore: bafybeihdfdezgtr3s2lzq5y3oaitfrdy4u4pehionju2bdez35wcjgqx6y
   __init__.py: bafybeibkyjt4covc4yhd22aw7kav45zozk3exdv344emt3lilln64soaxm
-  behaviours.py: bafybeihepitd4wkhpvpltxbigcpwujeqbz33zhqdc4uqd5cibmluugo2ta
+  behaviours.py: bafybeifppb4bp7chtd7enai6s2lhfscskixqfpz3iyn4dvjgynskbduqcq
   dialogues.py: bafybeicmaufkl7vdomnfciv7lw4536ssld7x4uemdapuhsyvfpd4ncibza
   fsm_specification.yaml: bafybeignycknz7kr7kb6d3txsdfyhxancqxxqxlxvhwau5wavnu7bqbyo4
   handlers.py: bafybeicj2skzmias5pqvbctiidwgioreaabspsppxn5ytl6e356is4lgga
   models.py: bafybeieuqi5mdkhxb5bntv5deh6khofcxq6l2x2qr3gwwx77vsweexumla
   payloads.py: bafybeifococfoabmghaniuqivshbnh4ttuqotpol25jnd7h75lo46krcr4
-  propose_questions.py: bafybeiewzztwirocscn27ozuhcu227iya42gb2tqr4rdwma4pa3jdzz55m
+  propose_questions.py: bafybeihcm4eggv5y3dwvxiamn5u5cdwwuzkwf5hrnho6t6vbhnasva7lce
   rounds.py: bafybeidslosv7v4wdrn4zozgqmpxoseoi26yszsyocpmvpuwq26ih3wvgq
   tests/__init__.py: bafybeihfxvqnyfly72tbxnnnglshcilm2kanihqnjiasvcz3ec3csw32ti
 fingerprint_ignore_patterns: []

packages/valory/skills/market_maker_abci/skill.yaml

@@ -26,7 +26,7 @@ skills:
 - valory/abstract_round_abci:0.1.0:bafybeiar2yhzxacfe3qqamqhaihtlcimquwedffctw55sowx6rac3cm3ui
 - valory/registration_abci:0.1.0:bafybeieu7vq3pyns4t5ty6u3sbmpkd7yznpg3rmqifoz3jhy7pmqyg3w6q
 - valory/reset_pause_abci:0.1.0:bafybeiameewywqigpupy3u2iwnkfczeiiucue74x2l5lbge74rmw6bgaie
-- valory/market_creation_manager_abci:0.1.0:bafybeifs4rcj56jgenlu5lkn5jkovhz3tri24r5gfuwtcr74y23fd3in7a
+- valory/market_creation_manager_abci:0.1.0:bafybeihxjaotedw6oxo2uixz7tgpjvr4iq7mxdvacvxlnmlfrhskzgiwt4
 - valory/termination_abci:0.1.0:bafybeif2zim2de356eo3sipkmoev5emwadpqqzk3huwqarywh4tmqt3vzq
 - valory/transaction_settlement_abci:0.1.0:bafybeic3tccdjypuge2lewtlgprwkbb53lhgsgn7oiwzyrcrrptrbeyote
 - valory/mech_interact_abci:0.1.0:bafybeieryw7rk2tspyxx46loqqqimr2l5vvhtshiyg2mmdxijzb7pdoi6a