imsciences 0.6.0.7__tar.gz → 0.6.0.8__tar.gz

{imsciences-0.6.0.7 → imsciences-0.6.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imsciences
-Version: 0.6.0.7
+Version: 0.6.0.8
 Summary: IMS Data Processing Package
 Author: IMS
 Author-email: cam@im-sciences.com

{imsciences-0.6.0.7 → imsciences-0.6.0.8}/imsciences/datafunctions.py

@@ -9,7 +9,7 @@ import re
 import pandas as pd
 from fredapi import Fred
 import time
-from datetime import datetime
+from datetime import datetime,timedelta
 from cif import cif
 from io import StringIO
 import urllib
@@ -440,7 +440,7 @@ class dataprocessing:
 
         return fig
 
-    def week_of_year_mapping(self, df, week_col, start_day_str):
+    def week_of_year_mapping(df, week_col, start_day_str):
 
         # Mapping of string day names to day numbers (1 for Monday, 7 for Sunday)
         day_mapping = {
@@ -456,15 +456,15 @@ class dataprocessing:
         def week_to_startdate(week_str, start_day):
             year, week = map(int, week_str.split('-W'))
             first_day_of_year = datetime(year, 1, 1)
-            day_of_week = first_day_of_year.isocalendar()[2]
-            days_to_add = (7 - day_of_week + 1) if day_of_week > 4 else (1 - day_of_week)
-            start_of_iso_week = first_day_of_year + datetime.timedelta(days=days_to_add)
+            first_weekday_of_year = first_day_of_year.weekday()  # Monday is 0 and Sunday is 6
 
-            # Adjust start day
-            days_to_shift = (start_day - 1) % 7
-            start_of_week = start_of_iso_week + datetime.timedelta(days=days_to_shift)
+            # Calculate days to adjust to the desired start day of the week
+            days_to_adjust = (start_day - 1 - first_weekday_of_year) % 7
+            start_of_iso_week = first_day_of_year + timedelta(days=days_to_adjust)
 
-            return start_of_week + datetime.timedelta(weeks=week - 1)
+            # Calculate the start of the desired week
+            start_of_week = start_of_iso_week + timedelta(weeks=week - 1)
+            return start_of_week
 
         # Apply the function to each row in the specified week column
         df['OBS'] = df[week_col].apply(lambda x: week_to_startdate(x, start_day)).dt.strftime('%d/%m/%Y')
@@ -1334,7 +1334,7 @@ class datapull:
         print("   - Usage: pull_ons_data(series_list, week_commencing)")
         print("   - Example: pull_ons_data([{'series_id': 'LMSBSA', 'dataset_id': 'LMS'}], 'mon')")
 
-        print("\n4. pull_macro")
+        print("\n4. pull_oecd")
         print("   - Description: Fetch macroeconomic data from OECD and other sources for a specified country.")
         print("   - Usage: pull_macro(country='GBR', week_commencing='mon')")
         print("   - Example: pull_macro('GBR', 'mon')")
@@ -2708,5 +2708,4 @@ class datapull:
 
         final_weather = ims_proc.rename_cols(merged_df, 'seas_')
 
-        return final_weather
-
+        return final_weather

{imsciences-0.6.0.7 → imsciences-0.6.0.8}/imsciences.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imsciences
-Version: 0.6.0.7
+Version: 0.6.0.8
 Summary: IMS Data Processing Package
 Author: IMS
 Author-email: cam@im-sciences.com

{imsciences-0.6.0.7 → imsciences-0.6.0.8}/setup.py

@@ -8,7 +8,7 @@ def read_md(file_name):
             return f.read()
     return ''
 
-VERSION = '0.6.0.7'
+VERSION = '0.6.0.8'
 DESCRIPTION = 'IMS Data Processing Package'
 LONG_DESCRIPTION = read_md('README.md')  # Reading from README.md