scraping-rtn 0.0.7__py3-none-any.whl → 0.0.7.2__py3-none-any.whl

scraping_rtn/RtnSingleTeamYear.py

@@ -17,7 +17,7 @@ class RtnSingleTeamYear(object):
 
     def get_team_mapping(self, force_update=False):
         if force_update:
-            get_data_from_api.clear_cache()
+            get_data_from_api.cache_clear()
 
         all_teams_data = get_data_from_api(endpoint='gymnasts2', suffix=str(self.year) + '/1').json()
         return {team['team_name']: team['id'] for team in all_teams_data['teams']}
@@ -40,7 +40,7 @@ class RtnSingleTeamYear(object):
         school_year_map = {'1': 'FR', '2': 'SO', '3': 'JR', '4': 'SR'}
 
         if force_update:
-            get_data_from_api.clear_cache()
+            get_data_from_api.cache_clear()
 
         roster_data = get_data_from_api(endpoint='rostermain', suffix=str(self.year)+'/'+str(self.team_id)+'/1').json()
 
@@ -64,7 +64,7 @@ class RtnSingleTeamYear(object):
 
     def _get_raw_season_results(self, force_update=False):
         if force_update:
-            get_data_from_api.clear_cache()
+            get_data_from_api.cache_clear()
 
         meets = get_data_from_api(endpoint='dashboard', suffix=str(self.year)+'/'+str(self.team_id)).json()
         name_map = {'team_id': 'Team ID', 'team_name': 'Team', 'meet_id': 'Team Meet ID',
@@ -123,7 +123,7 @@ class RtnSingleTeamYear(object):
         for meet_id in [data['Team Meet ID'] for data in self._raw_season_results if data['Meet Date'] <= datetime.now()]:
             try:
                 if force_update:
-                    get_data_from_api.clear_cache()
+                    get_data_from_api.cache_clear()
 
                 meet_res = get_data_from_api(endpoint='meetresults', suffix=str(meet_id)).json()
                 # This API call returns scores from all teams at this meet, not just this team. Need to pick out correct score
@@ -142,7 +142,7 @@ class RtnSingleTeamYear(object):
 
     def _team_event_scores_team_consistency(self, force_update=False):
         if force_update:
-            get_data_from_api.clear_cache()
+            get_data_from_api.cache_clear()
 
         res = get_data_from_api(endpoint='teamConsistency', suffix=f'{self.year}/{self.team_id}').json()
         if len(res['labels']) == 0:
@@ -192,7 +192,7 @@ class RtnSingleTeamYear(object):
         for meet_id in [meet['Team Meet ID'] for meet in self._raw_schedule if meet['Meet Date'] <= datetime.now()]:
             try:
                 if force_update:
-                    get_data_from_api.clear_cache()
+                    get_data_from_api.cache_clear()
 
                 meet_res = get_data_from_api(endpoint='meetresults', suffix=str(meet_id)).json()
                 if len(meet_res) == 0 or len(meet_res['scores']) == 0 or len(meet_res['scores'][0]) == 0:
@@ -234,7 +234,7 @@ class RtnSingleTeamYear(object):
         for gymnast in self._raw_roster:
             try:
                 if force_update:
-                    get_data_from_api.clear_cache()
+                    get_data_from_api.cache_clear()
 
                 res = get_data_from_api(endpoint='indConsistency', suffix=f"{self.year}/{gymnast['Gymnast ID']}").json()
                 ind_consistency = [{'Meet Date': normalize_date(res['labels'][i][:7] + str(self.year), dt_format='%b-%d-%Y'),
@@ -274,7 +274,7 @@ class RtnSingleTeamYear(object):
                     # 'maxaa': 'AA',
                     'gid': 'Gymnast ID'}
         if force_update:
-            get_data_from_api.clear_cache()
+            get_data_from_api.cache_clear()
 
         nqsData = get_data_from_api(endpoint='rostermain', suffix=f'{self.year}/{self.team_id}/4').json()
         ind_nqs = [{name_map[k]: round(float(v), 4) if k != 'gid' and v != '' else (np.nan if k != 'gid' else v)
@@ -290,7 +290,7 @@ class RtnSingleTeamYear(object):
     def _get_current_week(self, force_update=False):
         if not hasattr(self, 'week'):
             if force_update:
-                get_data_from_api.clear_cache()
+                get_data_from_api.cache_clear()
 
             week_data = get_data_from_api(endpoint='currentweek', suffix=str(self.year)).json()
             return min(int(week_data['week']), int(week_data['max']))
@@ -303,7 +303,7 @@ class RtnSingleTeamYear(object):
                       'usag': 'USAG', 'ave': 'Average', 'high': 'High', 'name': 'Team'}
 
         if force_update:
-            get_data_from_api.clear_cache()
+            get_data_from_api.cache_clear()
 
         res = get_data_from_api(endpoint='results', suffix=f'{self.year}/{week}/{team_ind_map[team_vs_ind]}/{event_api_map[event]}').json()
         if team_vs_ind == 'ind':

scraping_rtn/__init__.py

@@ -16,12 +16,12 @@ def roster(year, teams, include_hometowns=False, include_class=False, include_ev
     teams = validate_input(teams)
 
     all_rosters = []
-    for team in teams:
+    for i, team in enumerate(teams):
         if verbose:
             print(f'Getting roster for {team}                              ', end='\r' if team != teams[-1] else None)
         rtn = RtnSingleTeamYear(year=year, team_name=team)
         res = rtn.get_roster(include_hometowns=include_hometowns, include_class=include_class,
-                             include_events=include_events, force_update=force_update)
+                             include_events=include_events, force_update=force_update if i == 0 else False)
         if verbose and len(res) == 0:
             print(f'\tNo roster found for {team}')
         all_rosters.append(res)
@@ -34,11 +34,11 @@ def schedule(year, teams, verbose=False, force_update=False):
     teams = validate_input(teams)
 
     all_schedules = []
-    for team in teams:
+    for i, team in enumerate(teams):
         if verbose:
             print(f'Getting schedule for {team}                              ', end='\r' if team != teams[-1] else None)
         rtn = RtnSingleTeamYear(year=year, team_name=team)
-        res = rtn.get_schedule(force_update=force_update)
+        res = rtn.get_schedule(force_update=force_update if i == 0 else False)
         if verbose and len(res) == 0:
             print(f'\tNo schedule found for {team}')
         all_schedules.append(res)
@@ -50,11 +50,11 @@ def team_results(year, teams, method='team_consistency', force_update=False, ver
     teams = validate_input(teams)
 
     all_results = []
-    for team in teams:
+    for i, team in enumerate(teams):
         if verbose:
             print(f'Getting schedule and results for {team}                              ', end='\r' if team != teams[-1] else None)
         rtn = RtnSingleTeamYear(year=year, team_name=team)
-        res = rtn.get_team_scores(method=method, force_update=force_update)
+        res = rtn.get_team_scores(method=method, force_update=force_update if i == 0 else False)
         if verbose and len(res) == 0:
             print(f'\tNo schedule and results found for {team}')
         all_results.append(res)
@@ -66,11 +66,11 @@ def individual_results(year, teams, method='by_meet', force_update=False, verbos
     teams = validate_input(teams)
 
     all_scores = []
-    for team in teams:
+    for i, team in enumerate(teams):
         if verbose:
             print(f'Getting scores for {team}                              ', end='\r' if team != teams[-1] else None)
         rtn = RtnSingleTeamYear(year=year, team_name=team)
-        res = rtn.get_individual_scores(method=method, force_update=force_update)
+        res = rtn.get_individual_scores(method=method, force_update=force_update if i == 0 else False)
         if verbose and len(res) == 0:
             print(f'\tNo scores found for {team}')
         all_scores.append(res)
@@ -82,11 +82,11 @@ def individual_nqs(year, teams, verbose=False, force_update=False):
     teams = validate_input(teams)
 
     all_nqs = []
-    for team in teams:
+    for i, team in enumerate(teams):
         if verbose:
             print(f'Getting individual NQS for {team}                              ', end='\r' if team != teams[-1] else None)
         rtn = RtnSingleTeamYear(year=year, team_name=team)
-        res = rtn.get_individual_nqs(force_update=force_update)
+        res = rtn.get_individual_nqs(force_update=force_update if i == 0 else False)
         if verbose and len(res) == 0:
             print(f'\tNo individual NQS found for {team}')
         all_nqs.append(res)

{scraping_rtn-0.0.7.dist-info → scraping_rtn-0.0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: scraping_rtn
-Version: 0.0.7
+Version: 0.0.7.2
 Summary: package to scrape gymnastics data from Road To Nationals
 Author-email: Claire Harmon <ceharmon220@gmail.com>
 Project-URL: Homepage, https://github.com/cgn-charmon/scraping_rtn

scraping_rtn-0.0.7.2.dist-info/RECORD

@@ -0,0 +1,8 @@
+scraping_rtn/RtnSingleTeamYear.py,sha256=04vdtfmw7eEGl6h-Jb0DykqlbNX6bRcY8cs0SbAsv0I,18435
+scraping_rtn/__init__.py,sha256=zA0jJ8U3MkMfLtnaWo-dcVvzrPpISLQlC62ZAJ1pm74,4230
+scraping_rtn/src.py,sha256=vKWqCi9tfsJC1Di2uzHm_w0xk4ooTuzXrYtUSXG5TrI,24003
+scraping_rtn-0.0.7.2.dist-info/LICENSE,sha256=hbUs8BYJhECMTIKtiPtjcfq-0fWEtLTxB42IS_SzxWk,1069
+scraping_rtn-0.0.7.2.dist-info/METADATA,sha256=UxuqMAobTGB4w1d5Iya7qlp4fEmYoYzHYK3xyesNSJw,669
+scraping_rtn-0.0.7.2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+scraping_rtn-0.0.7.2.dist-info/top_level.txt,sha256=PlP9g-4WmuusQ1B-LmteQpLp-jVJdnh0BX8qAzBqDEE,13
+scraping_rtn-0.0.7.2.dist-info/RECORD,,

scraping_rtn-0.0.7.dist-info/RECORD

@@ -1,8 +0,0 @@
-scraping_rtn/RtnSingleTeamYear.py,sha256=gxjoC5agltKHPvjh4g5GyNNojRsOZ5kTS_iw8sB0uQ8,18435
-scraping_rtn/__init__.py,sha256=RWz-VwgQ2qwdJaC43J_tXrnIsgbtMgGw_k2Xoby4l9M,4055
-scraping_rtn/src.py,sha256=vKWqCi9tfsJC1Di2uzHm_w0xk4ooTuzXrYtUSXG5TrI,24003
-scraping_rtn-0.0.7.dist-info/LICENSE,sha256=hbUs8BYJhECMTIKtiPtjcfq-0fWEtLTxB42IS_SzxWk,1069
-scraping_rtn-0.0.7.dist-info/METADATA,sha256=p3qSUy81adYgaIpK4v2_8WFD7j0jAbDgnBgVXCIw6sw,667
-scraping_rtn-0.0.7.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-scraping_rtn-0.0.7.dist-info/top_level.txt,sha256=PlP9g-4WmuusQ1B-LmteQpLp-jVJdnh0BX8qAzBqDEE,13
-scraping_rtn-0.0.7.dist-info/RECORD,,