- Docker files

Author: V3xe

General.py

@@ -2,7 +2,7 @@
 import json
 
 class misc_functions():
-    #reading data from JSON file
+    """#reading data from JSON fil"""
     @staticmethod
     def get_data_from_json() -> dict:
         print('Getting data from JSON...')

TwitterIntegration.py

@@ -39,17 +39,21 @@ async def prepare_twitter(city_data: dict, *,config_json:dict) -> str:
                                                        temp_act=city_data['temp_act'],
                                                        humidity=city_data['humidity'],
                                                        pressure=city_data['pressure'],
-                                                       city=city_data['city_name']
+                                                       city_hash=city_data['city_name'].replace(" ","")
                                                        )
         return twitter_body
 
     @staticmethod
     async def create_twitter(*,client: object, twitter_body: str) -> None:
         """Post to twitter"""
         try:
-            client.twitter(text=twitter_body)
-            print('Twitter posted...')
+            client.create_tweet(text=twitter_body)
+            print(f'Twitter posted...')
         except tweepy.errors.BadRequest as e:
             print(f'Error while posting tweet -> \n {twitter_body}\n {e.response.status_code}...')
         except tweepy.errors.TooManyRequests as e:
             print(f'Error while posting tweet -> \n {twitter_body}\n {e.response.status_code}...')
+        except tweepy.errors.Forbidden as e:
+            print(f'Error while posting tweet -> \n {twitter_body}\n {e.response.status_code}...')
+        except SystemError as e:
+            print(f'Error while posting tweet -> \n {twitter_body}\n {e.response.status_code}...')

WeatherManagment.py

@@ -1,7 +1,5 @@
 #Get data from open weather, return data to post on twitter
 import requests
-import json
-import asyncio
 import aiohttp
 
 
@@ -43,6 +41,7 @@ async def call_api(session: aiohttp.ClientSession,city:str, api_key:str):
                 if response.status == 404:
                     print(f'Status -> {response.status}')
                     raise requests.HTTPError(response.status)
+
                 return await response.json()
             except Exception as e:
                 print(f'Error with URL {response.url}, error -> {e}')
@@ -51,7 +50,14 @@ async def call_api(session: aiohttp.ClientSession,city:str, api_key:str):
     async def prepare_data(city_json: dict) -> dict:
         """Prepare data for further processing"""
         city_data: dict = {}
-        city_data['city_name'] = city_json['name']
+
+        if city_json['name'] == 'Województwo opolskie':
+            city_data['city_name'] = 'Opole'
+        elif city_json['name'] == 'Województwo lubelskie':
+            city_data['city_name'] = 'Lublin'
+        else:
+            city_data['city_name'] = city_json['name']
+
         city_data['weather_dsc'] = city_json['weather'][0]['description']
         city_data['temp_min'] = city_json['main']['temp_min']
         city_data['temp_max'] = city_json['main']['temp_max']

config.json

@@ -1,27 +1,30 @@
 {
-
-
-"cityList": [
-  "Kielce",
-  "Wrocław",
-  "Bydgoszcz",
-  "Toruń",
-  "Lublin",
-  "Gorzów Wielkopolski",
-  "Zielona Góra",
-  "Łódź",
-  "Kraków",
-  "Warszawa",
-  "Opole",
-  "Rzeszów",
-  "Białystok",
-  "Gdańsk",
-  "Katowice",
-  "Kielce",
-  "Olsztyn",
-  "Poznań",
-  "Szczecin"
-]
-
+  "apiKeyTweeter":"",
+"apiSecretTweeter":"",
+"bearerTokenTweeter":"",
+"accessTokenTweeter":"",
+"accessTokenSecretTweeter":"",
+"apiKeyOpenWeather": "",
+  "city_list": [
+    "Białystok",
+    "Bydgoszcz",
+    "Gdańsk",
+    "Gorzów Wielkopolski",
+    "Katowice",
+    "Kielce",
+    "Kraków",
+    "Lublin",
+    "Łódź",
+    "Olsztyn",
+    "Opole",
+    "Poznań",
+    "Rzeszów",
+    "Szczecin",
+    "Toruń",
+    "Warszawa",
+    "Wrocław",
+    "Zielona Góra"
+  ],
+  "twitter_template": "Miasto: {city_name}\nPogoda: {weather_dsc}\nTemperatura: {temp_act} C\nWilgotność: {humidity}%\nCiśnienie: {pressure}hPa\n#Polska #{city_hash} #Pogoda"
 }
 

main.py

@@ -39,12 +39,13 @@ async def main() -> None:
         print('Preparing bodies for twitter...')
         tasks: list[dict] = [twitter.prepare_twitter(desc, config_json=config_json) for desc in processing_data]
         twitter_bodies = await asyncio.gather(*tasks)
+        #print(twitter_bodies)
 
     #Post to twitter
         print('Preparing bodies for twitter...')
-        for item in twitter_bodies:
-            print('-----')
-            print(item)
+        #for item in twitter_bodies:
+        #   print('-----')
+        #   print(item)
 
         tasks: list[dict] = [twitter.create_twitter(client=client,twitter_body=body) for body in twitter_bodies]
         asyncio.gather(*tasks)