clean some code

regulatory_comments_api.py

@@ -14,6 +14,7 @@
 
 
 import requests
+import re
 import datasets
 from datasets import BuilderConfig
 
@@ -90,16 +91,69 @@ class RegulationsDataFetcher:
             print(f'Failed to retrieve comment details: {response.status_code}')
             return None
 
+    # def collect_data(self):
+    #     """Collect data and reshape into nested dictionary format."""
+    #     data = self.fetch_comments()
+    #     if data is None:
+    #         return None  
+
+    #     docket_info = self.get_docket_info()
+    #     if docket_info is None:
+    #         return None
+
+    #     nested_data = {
+    #         "id": self.docket_id,
+    #         "agency": self.docket_id.split('-')[0],
+    #         "title": docket_info[1] if docket_info else "Unknown Title",
+    #         "update_date": docket_info[2].split('T')[0] if docket_info and docket_info[2] else "Unknown Update Date",
+    #         "update_time": docket_info[2].split('T')[1].strip('Z') if docket_info and docket_info[2] and 'T' in docket_info[2] else "Unknown Update Time",
+    #         "purpose": docket_info[3],
+    #         "keywords": docket_info[4],
+    #         "comments": []
+    #     }
+
+    #     if 'data' in data:
+    #         for comment in data['data']:
+    #             comment_details = self.fetch_comment_details(comment['links']['self'])
+
+    #             # Here, we extra information and perform cleaning. 
+    #             if 'data' in comment_details and 'attributes' in comment_details['data']:
+    #                 comment_data = comment_details['data']['attributes']
+    #                 comment_text = (comment_data.get('comment', '') or '').strip()
+    #                 comment_text = (comment_text # Doing some extra cleaning
+    #                                 .replace("<br/>", "")
+    #                                 .replace("<span style='padding-left: 30px'></span>", "")
+    #                                 .replace(re.sub(r'&[^;]+;', '', comment_text)))
+
+    #                 if (comment_text and "attached" not in comment_text.lower() and "attachment" not in comment_text.lower() and comment_text.lower() != "n/a"):
+    #                     nested_comment = {
+    #                         "text": comment_text,
+    #                         "comment_id": comment['id'],
+    #                         "comment_url": comment['links']['self'],
+    #                         "comment_date": comment['attributes']['postedDate'].split('T')[0],
+    #                         "comment_time": comment['attributes']['postedDate'].split('T')[1].strip('Z'),
+    #                         "commenter_fname": ((comment_data.get('firstName') or 'Anonymous').split(',')[0]).capitalize(),
+    #                         "commenter_lname": ((comment_data.get('lastName') or 'Anonymous').split(',')[0]).capitalize(),
+    #                         "comment_length": len(comment_text) if comment_text is not None else 0
+    #                     }
+    #                     nested_data["comments"].append(nested_comment)
+
+    #             if len(nested_data["comments"]) >= 10:
+    #                 break
+
+    #     return nested_data
+        
     def collect_data(self):
         """Collect data and reshape into nested dictionary format."""
         data = self.fetch_comments()
-        if data is None:
-            return None  
+        if not data:
+            return None
 
         docket_info = self.get_docket_info()
-        if docket_info is None:
+        if not docket_info:
             return None
 
+        # Starting out with docket information
         nested_data = {
             "id": self.docket_id,
             "agency": self.docket_id.split('-')[0],
@@ -111,32 +165,39 @@ class RegulationsDataFetcher:
             "comments": []
         }
 
+        # Adding in comment information
         if 'data' in data:
             for comment in data['data']:
+                if len(nested_data["comments"]) >= 10:
+                    break
+
                 comment_details = self.fetch_comment_details(comment['links']['self'])
                 if 'data' in comment_details and 'attributes' in comment_details['data']:
                     comment_data = comment_details['data']['attributes']
+
+                    # Basic comment text cleaning
                     comment_text = (comment_data.get('comment', '') or '').strip()
+                    comment_text = comment_text.replace("<br/>", "").replace("<span style='padding-left: 30px'></span>", "")
+                    comment_text = re.sub(r'&[^;]+;', '', comment_text)
 
-                    if (comment_text and "attached" not in comment_text.lower() and "attachment" not in comment_text.lower() and comment_text.lower() != "n/a"):
-                        # Replace empty commenter_fname with "Anonymous"
+                    if comment_text and "attached" not in comment_text.lower() and "attachment" not in comment_text.lower() and comment_text.lower() != "n/a":
                         nested_comment = {
                             "text": comment_text,
                             "comment_id": comment['id'],
                             "comment_url": comment['links']['self'],
                             "comment_date": comment['attributes']['postedDate'].split('T')[0],
                             "comment_time": comment['attributes']['postedDate'].split('T')[1].strip('Z'),
-                            "commenter_fname": ((comment_data.get('firstName') or 'Anonymous').split(',')[0]).capitalize(),
-                            "commenter_lname": ((comment_data.get('lastName') or 'Anonymous').split(',')[0]).capitalize(),
-                            "comment_length": len(comment_text) if comment_text is not None else 0
+                            "commenter_fname": (comment_data.get('firstName', 'Anonymous').split(',')[0]).capitalize(),
+                            "commenter_lname": (comment_data.get('lastName', 'Anonymous').split(',')[0]).capitalize(),
+                            "comment_length": len(comment_text)
                         }
                         nested_data["comments"].append(nested_comment)
 
-                if len(nested_data["comments"]) >= 10:
-                    break
-
         return nested_data
 
+        
+
+
     
 class RegCommentsAPIConfig(BuilderConfig):
     def __init__(self, api_key=None, docket_ids = None, **kwargs):