Refactor project structure "api"

README.md

@@ -86,7 +86,7 @@ uv pip install -e .
 A questo punto si può già modificare il codice e, quando necessario, far partire il progetto tramite il comando:
 
 ```sh
-uv run python src/app
+uv run src/app
 ```
 
 # **Applicazione**
@@ -106,10 +106,11 @@ src
 └── app
     ├── __main__.py
     ├── agents       <-- Agenti, modelli, prompts e simili
-    ├── base         <-- Classi base per le API
+    ├── api          <-- Tutte le API esterne
-    ├── markets      <-- Market data provider (Es. Binance)
+    │   ├── base     <-- Classi base per le API
-    ├── news         <-- News data provider (Es. NewsAPI)
+    │   ├── markets  <-- Market data provider (Es. Binance)
-    ├── social       <-- Social data provider (Es. Reddit)
+    │   ├── news     <-- News data provider (Es. NewsAPI)
+    │   └── social   <-- Social data provider (Es. Reddit)
     └── utils        <-- Codice di utilità generale
 ```
 

src/app/agents/pipeline.py

@@ -2,7 +2,7 @@ from agno.run.agent import RunOutput
 from app.agents.models import AppModels
 from app.agents.team import create_team_with
 from app.agents.predictor import PREDICTOR_INSTRUCTIONS, PredictorInput, PredictorOutput, PredictorStyle
-from app.base.markets import ProductInfo
+from app.api.base.markets import ProductInfo
 
 
 class Pipeline:

src/app/agents/predictor.py

@@ -1,6 +1,6 @@
 from enum import Enum
 from pydantic import BaseModel, Field
-from app.base.markets import ProductInfo
+from app.api.base.markets import ProductInfo
 
 
 class PredictorStyle(Enum):

src/app/agents/team.py

@@ -1,8 +1,8 @@
 from agno.team import Team
 from app.agents import AppModels
-from app.markets import MarketAPIsTool
+from app.api.markets import MarketAPIsTool
-from app.news import NewsAPIsTool
+from app.api.news import NewsAPIsTool
-from app.social import SocialAPIsTool
+from app.api.social import SocialAPIsTool
 
 
 def create_team_with(models: AppModels, coordinator: AppModels | None = None) -> Team:

src/app/api/markets/__init__.py

@@ -1,9 +1,9 @@
 from agno.tools import Toolkit
-from app.base.markets import MarketWrapper, Price, ProductInfo
+from app.api.base.markets import MarketWrapper, Price, ProductInfo
-from app.markets.binance import BinanceWrapper
+from app.api.markets.binance import BinanceWrapper
-from app.markets.coinbase import CoinBaseWrapper
+from app.api.markets.coinbase import CoinBaseWrapper
-from app.markets.cryptocompare import CryptoCompareWrapper
+from app.api.markets.cryptocompare import CryptoCompareWrapper
-from app.markets.yfinance import YFinanceWrapper
+from app.api.markets.yfinance import YFinanceWrapper
 from app.utils import aggregate_history_prices, aggregate_product_info, WrapperHandler
 
 __all__ = [ "MarketAPIsTool", "BinanceWrapper", "CoinBaseWrapper", "CryptoCompareWrapper", "YFinanceWrapper", "ProductInfo", "Price" ]

src/app/api/markets/binance.py

@@ -1,7 +1,7 @@
 import os
 from typing import Any
 from binance.client import Client # type: ignore
-from app.base.markets import ProductInfo, MarketWrapper, Price
+from app.api.base.markets import ProductInfo, MarketWrapper, Price
 
 
 def extract_product(currency: str, ticker_data: dict[str, Any]) -> ProductInfo:

src/app/api/markets/coinbase.py

@@ -3,7 +3,7 @@ from enum import Enum
 from datetime import datetime, timedelta
 from coinbase.rest import RESTClient # type: ignore
 from coinbase.rest.types.product_types import Candle, GetProductResponse, Product # type: ignore
-from app.base.markets import ProductInfo, MarketWrapper, Price
+from app.api.base.markets import ProductInfo, MarketWrapper, Price
 
 
 def extract_product(product_data: GetProductResponse | Product) -> ProductInfo:

src/app/api/markets/cryptocompare.py

@@ -1,7 +1,7 @@
 import os
 from typing import Any
 import requests
-from app.base.markets import ProductInfo, MarketWrapper, Price
+from app.api.base.markets import ProductInfo, MarketWrapper, Price
 
 
 def extract_product(asset_data: dict[str, Any]) -> ProductInfo:

src/app/api/markets/yfinance.py

@@ -1,6 +1,6 @@
 import json
 from agno.tools.yfinance import YFinanceTools
-from app.base.markets import MarketWrapper, ProductInfo, Price
+from app.api.base.markets import MarketWrapper, ProductInfo, Price
 
 
 def extract_product(stock_data: dict[str, str]) -> ProductInfo:

src/app/api/news/__init__.py

@@ -1,10 +1,10 @@
 from agno.tools import Toolkit
 from app.utils import WrapperHandler
-from app.base.news import NewsWrapper, Article
+from app.api.base.news import NewsWrapper, Article
-from app.news.news_api import NewsApiWrapper
+from app.api.news.news_api import NewsApiWrapper
-from app.news.googlenews import GoogleNewsWrapper
+from app.api.news.googlenews import GoogleNewsWrapper
-from app.news.cryptopanic_api import CryptoPanicWrapper
+from app.api.news.cryptopanic_api import CryptoPanicWrapper
-from app.news.duckduckgo import DuckDuckGoWrapper
+from app.api.news.duckduckgo import DuckDuckGoWrapper
 
 __all__ = ["NewsAPIsTool", "NewsApiWrapper", "GoogleNewsWrapper", "CryptoPanicWrapper", "DuckDuckGoWrapper", "Article"]
 

src/app/api/news/cryptopanic_api.py

@@ -2,7 +2,7 @@ import os
 from typing import Any
 import requests
 from enum import Enum
-from app.base.news import NewsWrapper, Article
+from app.api.base.news import NewsWrapper, Article
 
 
 class CryptoPanicFilter(Enum):

src/app/api/news/duckduckgo.py

@@ -1,7 +1,7 @@
 import json
 from typing import Any
 from agno.tools.duckduckgo import DuckDuckGoTools
-from app.base.news import Article, NewsWrapper
+from app.api.base.news import Article, NewsWrapper
 
 
 def extract_article(result: dict[str, Any]) -> Article:

src/app/api/news/googlenews.py

@@ -1,6 +1,6 @@
 from typing import Any
 from gnews import GNews # type: ignore
-from app.base.news import Article, NewsWrapper
+from app.api.base.news import Article, NewsWrapper
 
 
 def extract_article(result: dict[str, Any]) -> Article:

src/app/api/news/news_api.py

@@ -1,7 +1,7 @@
 import os
 from typing import Any
 import newsapi # type: ignore
-from app.base.news import Article, NewsWrapper
+from app.api.base.news import Article, NewsWrapper
 
 
 def extract_article(result: dict[str, Any]) -> Article:

src/app/api/social/__init__.py

@@ -1,7 +1,7 @@
 from agno.tools import Toolkit
 from app.utils import WrapperHandler
-from app.base.social import SocialPost, SocialWrapper
+from app.api.base.social import SocialPost, SocialWrapper
-from app.social.reddit import RedditWrapper
+from app.api.social.reddit import RedditWrapper
 
 __all__ = ["SocialAPIsTool", "RedditWrapper", "SocialPost"]
 

src/app/api/social/reddit.py

@@ -1,7 +1,7 @@
 import os
 from praw import Reddit # type: ignore
 from praw.models import Submission # type: ignore
-from app.base.social import SocialWrapper, SocialPost, SocialComment
+from app.api.base.social import SocialWrapper, SocialPost, SocialComment
 
 
 MAX_COMMENTS = 5

src/app/utils/market_aggregation.py

@@ -1,5 +1,5 @@
 import statistics
-from app.base.markets import ProductInfo, Price
+from app.api.base.markets import ProductInfo, Price
 
 
 def aggregate_history_prices(prices: dict[str, list[Price]]) -> list[Price]:

tests/agents/test_predictor.py

@@ -1,7 +1,7 @@
 import pytest
 from app.agents import AppModels
 from app.agents.predictor import PREDICTOR_INSTRUCTIONS, PredictorInput, PredictorOutput, PredictorStyle
-from app.base.markets import ProductInfo
+from app.api.base.markets import ProductInfo
 
 def unified_checks(model: AppModels, input: PredictorInput) -> None:
     llm = model.get_agent(PREDICTOR_INSTRUCTIONS, output_schema=PredictorOutput) # type: ignore[arg-type]

tests/api/test_binance.py

@@ -1,5 +1,5 @@
 import pytest
-from app.markets.binance import BinanceWrapper
+from app.api.markets.binance import BinanceWrapper
 
 @pytest.mark.market
 @pytest.mark.api

tests/api/test_coinbase.py

@@ -1,6 +1,6 @@
 import os
 import pytest
-from app.markets import CoinBaseWrapper
+from app.api.markets import CoinBaseWrapper
 
 @pytest.mark.market
 @pytest.mark.api

tests/api/test_cryptocompare.py

@@ -1,6 +1,6 @@
 import os
 import pytest
-from app.markets import CryptoCompareWrapper
+from app.api.markets import CryptoCompareWrapper
 
 @pytest.mark.market
 @pytest.mark.api

tests/api/test_cryptopanic_api.py

@@ -1,6 +1,6 @@
 import os
 import pytest
-from app.news import CryptoPanicWrapper
+from app.api.news import CryptoPanicWrapper
 
 
 @pytest.mark.limited

tests/api/test_duckduckgo_news.py

@@ -1,5 +1,5 @@
 import pytest
-from app.news import DuckDuckGoWrapper
+from app.api.news import DuckDuckGoWrapper
 
 
 @pytest.mark.news

tests/api/test_google_news.py

@@ -1,5 +1,5 @@
 import pytest
-from app.news import GoogleNewsWrapper
+from app.api.news import GoogleNewsWrapper
 
 
 @pytest.mark.news

tests/api/test_news_api.py

@@ -1,6 +1,6 @@
 import os
 import pytest
-from app.news import NewsApiWrapper
+from app.api.news import NewsApiWrapper
 
 
 @pytest.mark.news

tests/api/test_reddit.py

@@ -1,6 +1,6 @@
 import os
 import pytest
-from app.social.reddit import MAX_COMMENTS, RedditWrapper
+from app.api.social.reddit import MAX_COMMENTS, RedditWrapper
 
 @pytest.mark.social
 @pytest.mark.api

tests/api/test_yfinance.py

@@ -1,5 +1,5 @@
 import pytest
-from app.markets import YFinanceWrapper
+from app.api.markets import YFinanceWrapper
 
 @pytest.mark.market
 @pytest.mark.api

tests/tools/test_market_tool.py

@@ -1,5 +1,5 @@
 import pytest
-from app.markets import MarketAPIsTool
+from app.api.markets import MarketAPIsTool
 
 
 @pytest.mark.tools

tests/tools/test_news_tool.py

@@ -1,5 +1,5 @@
 import pytest
-from app.news import NewsAPIsTool
+from app.api.news import NewsAPIsTool
 
 
 @pytest.mark.tools

tests/tools/test_socials_tool.py

@@ -1,5 +1,5 @@
 import pytest
-from app.social import SocialAPIsTool
+from app.api.social import SocialAPIsTool
 
 
 @pytest.mark.tools
@@ -24,7 +24,7 @@ class TestSocialAPIsTool:
         result = tool.wrapper_handler.try_call_all(lambda w: w.get_top_crypto_posts(limit=2))
         assert isinstance(result, dict)
         assert len(result.keys()) > 0
-        for provider, posts in result.items():
+        for _provider, posts in result.items():
             for post in posts:
                 assert post.title is not None
                 assert post.time is not None

tests/utils/test_market_aggregator.py

@@ -1,6 +1,6 @@
 import pytest
 from datetime import datetime
-from app.base.markets import ProductInfo, Price
+from app.api.base.markets import ProductInfo, Price
 from app.utils.market_aggregation import aggregate_history_prices, aggregate_product_info