refactoring code

Signed-off-by: Deepak Raj <54245038+codePerfectPlus@users.noreply.github.com>

Author: codeperfectplus

.github/workflows/add_labels.yaml

@@ -14,4 +14,4 @@ jobs:
           python -m pip install --upgrade pip
           pip install flake8
       - name: Lint with flake8
-        run: flake8 . --isolated --exclude=.cache,.venv,.svn,CVS,.bzr,.hg,.git,__pycache__,.tox,**/migrations/** --ignore=E203,W503,E501,F401
+        run: flake8 . --isolated --exclude=.cache,.venv,.svn,CVS,.bzr,.hg,.git,__pycache__,.tox,**/migrations/** --ignore=E402,E501,E401

.github/workflows/publish.yml

@@ -14,44 +14,42 @@
 parser.add_argument('-v', '--version', action='version', version=VERSION)
 parser.add_argument('--server', help='Start server', action='store_true')
 parser.add_argument('--port', help='Port number', type=int, default=8000)
-parser.add_argument('-n', help='Number of random profiles', type=int, default=1)
+parser.add_argument('-n', '--number', help='Number of random profiles', type=int, default=1)
 
 gender_arg_group = parser.add_mutually_exclusive_group()
+
 gender_arg_group.add_argument("-ma", "--male", help="Get only male profiles", action="store_true")
 gender_arg_group.add_argument("-fe", "--female", help="Get only female profiles", action="store_true")
-output_form_arg_group = parser.add_mutually_exclusive_group()
-
 
 output_form_arg_group = parser.add_mutually_exclusive_group()
 output_form_arg_group.add_argument('-p', '--profile', help='Get full profile', action='store_true')
 output_form_arg_group.add_argument('-f', '--firstname', help='Get first name', action='store_true')
 output_form_arg_group.add_argument('-l', '--lastname', help='Get last name instead of first name', action='store_true')
 output_form_arg_group.add_argument('-F', '--fullname', help='Get full name instead of first name', action='store_true')
-output_form_arg_group.add_argument('--ip', help='Get an ipv4 IP address', action='store_true')
-output_form_arg_group.add_argument('--job', help='Get job title', action='store_true')
-output_form_arg_group.add_argument('--address', help='Get address', action='store_true')
+output_form_arg_group.add_argument('-ip', '--ip_address', help='Get an ipv4 IP address', action='store_true')
+output_form_arg_group.add_argument('-j', '--job', help='Get job title', action='store_true')
+output_form_arg_group.add_argument('-a', '--address', help='Get address', action='store_true')
 args = parser.parse_args()
 
 
-
 def main():
     gender = None
     if args.male:
         gender = Gender.MALE
     elif args.female:
         gender = Gender.FEMALE
-    rp = RandomProfile(args.n, gender)
+    rp = RandomProfile(args.number, gender)
     if args.server:
         start_server(args.port)
     elif args.fullname:
-        pprint(rp.full_name())
+        pprint(rp.full_names())
     elif args.firstname:
-        pprint(rp.first_name())
+        pprint(rp.first_names())
     elif args.lastname:
-        pprint(rp.last_name())
+        pprint(rp.last_names())
     elif args.job:
         pprint(rp.job_title())
-    elif args.ip:
+    elif args.ip_address:
         pprint(rp.ip_address())
     elif args.address:
         pprint(rp.generate_address())

.github/workflows/python-app.yml

@@ -1 +0,0 @@
-

random_profile/cli.py

@@ -14,32 +14,33 @@
 sys.path.append('.')
 
 from random_profile.enums.gender import Gender
-from random_profile.utils import *
+from random_profile import utils
 
 VERSION = '2.0.1'
 
-lname_txt = os.path.join(ASSETS_DIR, "lnames.txt")
-fname_male_txt = os.path.join(ASSETS_DIR, "fnames_male.txt")
-fname_female_txt = os.path.join(ASSETS_DIR, "fnames_female.txt")
-hair_colors_txt = os.path.join(ASSETS_DIR, "hair_colors.txt")
-blood_types_txt = os.path.join(ASSETS_DIR, "blood_types.txt")
-street_names_txt = os.path.join(ASSETS_DIR, "street_names.txt")
-cities_name_txt = os.path.join(ASSETS_DIR, "cities_name.txt")
-states_names_txt = os.path.join(ASSETS_DIR, "states_names.txt")
-job_titles_txt = os.path.join(ASSETS_DIR, "job_titles.txt")
-job_levels_txt = os.path.join(ASSETS_DIR, "job_levels.txt")
+lname_txt = os.path.join(utils.ASSETS_DIR, "lnames.txt")
+fname_male_txt = os.path.join(utils.ASSETS_DIR, "fnames_male.txt")
+fname_female_txt = os.path.join(utils.ASSETS_DIR, "fnames_female.txt")
+hair_colors_txt = os.path.join(utils.ASSETS_DIR, "hair_colors.txt")
+blood_types_txt = os.path.join(utils.ASSETS_DIR, "blood_types.txt")
+street_names_txt = os.path.join(utils.ASSETS_DIR, "street_names.txt")
+cities_name_txt = os.path.join(utils.ASSETS_DIR, "cities_name.txt")
+states_names_txt = os.path.join(utils.ASSETS_DIR, "states_names.txt")
+job_titles_txt = os.path.join(utils.ASSETS_DIR, "job_titles.txt")
+job_levels_txt = os.path.join(utils.ASSETS_DIR, "job_levels.txt")
 
 # loading data from txt files
-lname = load_txt_file(lname_txt)
-fname_male = load_txt_file(fname_male_txt)
-fname_female = load_txt_file(fname_female_txt)
-hair_colors = load_txt_file(hair_colors_txt)
-blood_types = load_txt_file(blood_types_txt)
-states_names = load_txt_file(states_names_txt)
-cities_name = load_txt_file(cities_name_txt)
-street_names = load_txt_file(street_names_txt)
-job_titles = load_txt_file(job_titles_txt)
-job_levels = load_txt_file(job_levels_txt)
+lname = utils.load_txt_file(lname_txt)
+fname_male = utils.load_txt_file(fname_male_txt)
+fname_female = utils.load_txt_file(fname_female_txt)
+hair_colors = utils.load_txt_file(hair_colors_txt)
+blood_types = utils.load_txt_file(blood_types_txt)
+states_names = utils.load_txt_file(states_names_txt)
+cities_name = utils.load_txt_file(cities_name_txt)
+street_names = utils.load_txt_file(street_names_txt)
+job_titles = utils.load_txt_file(job_titles_txt)
+job_levels = utils.load_txt_file(job_levels_txt)
+
 
 class RandomProfile(object):
     def __init__(self, num: int = 1, gender: Gender = None):
@@ -75,8 +76,8 @@ def __getitem__(self, index):
     def ip_address(self, num: int = None) -> List[str]:
         num = self.num if num is None else num
         if num == 1 or num is None:
-            return ipv4_gen()
-        return [ipv4_gen() for _ in range(num)]
+            return utils.ipv4_gen()
+        return [utils.ipv4_gen() for _ in range(num)]
 
     def job_title(self, num: int = None) -> List[str]:
         num = self.num if num is None else num
@@ -99,14 +100,14 @@ def hair_color(self, num: int = None) -> List[str]:
     def dob_age(self, num: int = None) -> List[Tuple[str, int]]:
         num = self.num if num is None else num
         if num == 1 or num is None:
-            return generate_dob_age()
-        return [generate_dob_age() for _ in range(num)]
+            return utils.generate_dob_age()
+        return [utils.generate_dob_age() for _ in range(num)]
 
     def height_weight(self, num: int = None) -> List[Tuple[int, int]]:
         num = self.num if num is None else num
         if num == 1 or num is None:
-            return generate_random_height_weight()
-        return [generate_random_height_weight() for _ in range(num)]
+            return utils.generate_random_height_weight()
+        return [utils.generate_random_height_weight() for _ in range(num)]
 
     def generate_address(self, num: int = None) -> List[str]:
         num = self.num if num is None else num
@@ -128,7 +129,7 @@ def generate_address(self, num: int = None) -> List[str]:
             address_list.append(address)
 
         return address_list
-    
+
     def first_names(self, num: int = None, gender: Gender = None) -> list:
         num = self.num if num is None else num
         if gender is None:
@@ -139,10 +140,10 @@ def first_names(self, num: int = None, gender: Gender = None) -> list:
             names = fname_male
         else:
             names = fname_female
-            
+
         if num == 1 or num is None:
             return random.choice(names)
-        
+
         return random.choices(names, k=num)
 
     def last_names(self, num: int = None) -> list:
@@ -152,7 +153,7 @@ def last_names(self, num: int = None) -> list:
         if num == 1 or num is None:
             return random.choice(lname)
         return random.choices(lname, k=num)
-        
+
     def full_names(self, num: int = None, gender: Gender = None) -> list:
         num = self.num if num is None else num
 
@@ -165,12 +166,12 @@ def full_names(self, num: int = None, gender: Gender = None) -> list:
             names = fname_male
         else:
             names = fname_female
-        
+
         if num == 1 or num is None:
             return random.choice(names) + ' ' + random.choice(lname)
 
         return [random.choice(names) + ' ' + random.choice(lname) for _ in range(num)]
-        
+
     def full_profiles(self, num: int = None, gender: Gender = None) -> list:
         num = self.num if num is None else num
 
@@ -179,28 +180,24 @@ def full_profiles(self, num: int = None, gender: Gender = None) -> list:
         for _ in range(num):
 
             # random gender for every profile in list
-            this_gender = generate_random_gender() if gender is None else gender
+            this_gender = utils.generate_random_gender() if gender is None else gender
             first = random.choice(fname_male if this_gender.value == Gender.MALE.value else fname_female)
             last = random.choice(lname)
             full_name = first + ' ' + last
-            
+
             hair_color = random.choice(hair_colors)
             blood_type = random.choice(blood_types)
-            
-            phone_number = f'+1-{random.randint(300, 500)}-{random.randint(800, 999)}-{random.randint(1000,9999)}'
-
-            
 
-            dob, age = generate_dob_age()
-            height, weight = generate_random_height_weight()
+            phone_number = f'+1-{random.randint(300, 500)}-{random.randint(800, 999)}-{random.randint(1000,9999)}'
 
-            job_title = random.choice(job_titles)
-            job_experience = generate_random_job_level(age, job_levels)
+            dob, age = utils.generate_dob_age()
+            height, weight = utils.generate_random_height_weight()
+            job_experience = utils.generate_random_job_level(age, job_levels)
 
             street_num = random.randint(100, 999)
             street = random.choice(street_names)
-            city, coords = generate_random_city_coords(cities_name)
-            coords_pretty = coords_string(coords)
+            city, coords = utils.generate_random_city_coords(cities_name)
+            coords_pretty = utils.coords_string(coords)
             state = random.choice(states_names)
             zip_code = random.randint(10000, 99999)
 
@@ -211,13 +208,13 @@ def full_profiles(self, num: int = None, gender: Gender = None) -> list:
                 'state': state,
                 'zip_code': zip_code
             }
-            
+
             full_address = f'{street_num} {street}, {city}, {state} {zip_code}'
-            
+
             mother = self.first_names(1, Gender.FEMALE)[0] + ' ' + last
             father = self.first_names(1, Gender.MALE)[0] + ' ' + last
 
-            card = generate_random_card()
+            card = utils.generate_random_card()
 
             profile = {}
             profile['id'] = str(uuid.uuid4())
@@ -234,21 +231,20 @@ def full_profiles(self, num: int = None, gender: Gender = None) -> list:
             profile['age'] = age
             profile['phone_number'] = phone_number
             profile['email'] = profile['first_name'].lower() + profile['last_name'].lower() + '@example.com'
-            
-            
+
             profile['blood_type'] = self.blood_type(num=1)
             profile['height'] = height
             profile['weight'] = weight
             profile['hair_color'] = self.hair_color(num=1)
             profile['ip_address'] = self.ip_address(num=1)
 
-
             profile['address'] = address
             profile['full_address'] = full_address
             profile['job_job_experience'] = job_experience
             profile['mother'] = mother
             profile['father'] = father
             profile['payment_card'] = card
+            profile['coordinates'] = coords_pretty
 
             profile_list.append(profile)
 

random_profile/enums/__init__.py

@@ -105,6 +105,7 @@ def generate_random_card() -> dict:
 
     return card
 
+
 def generate_random_job_level(age: int, levels) -> str:
     levels_with_ranges = [level.split(';') for level in levels]
     applicable_level = list(filter(lambda level: (int(level[1]) <= age <= int(level[2])), levels_with_ranges))
@@ -113,7 +114,7 @@ def generate_random_job_level(age: int, levels) -> str:
 
     try:
         level = applicable_level[0][0]
-    except:
+    except Exception:
         print(applicable_level)
         print(age)
 
@@ -129,6 +130,7 @@ def random_coords_from_point(lat: float, lon: float, max_distance: float = 1000)
 
     return lat_, lon_
 
+
 def generate_random_city_coords(cities) -> tuple:
     city = random.choice(cities)
 
@@ -141,14 +143,16 @@ def generate_random_city_coords(cities) -> tuple:
     coords = random_coords_from_point(lat, lon)
     return name, coords
 
+
 def decdeg2dms(dd):
     mult = -1 if dd < 0 else 1
-    mnt,sec = divmod(abs(dd)*3600, 60)
-    deg,mnt = divmod(mnt, 60)
-    return mult*deg, mult*mnt, mult*sec
+    mnt, sec = divmod(abs(dd) * 3600, 60)
+    deg, mnt = divmod(mnt, 60)
+    return mult * deg, mult * mnt, mult * sec
+
 
-def coords_string (coords: tuple) -> str:
+def coords_string(coords: tuple) -> str:
     dms_lat = decdeg2dms(abs(coords[0]))
     dms_lon = decdeg2dms(abs(coords[1]))
 
-    return f"{dms_lat[0]:.0f}° {dms_lat[1]:.0f}' {dms_lat[2]:.4f}'' {'N' if coords[0] > 0 else 'S'} {dms_lon[0]:.0f}° {dms_lon[1]:.0f}' {dms_lon[2]:.4f}'' {'E' if coords[1] > 0 else 'W'}"
+    return f"{dms_lat[0]:.0f}° {dms_lat[1]:.0f}' {dms_lat[2]:.4f}'' {'N' if coords[0] > 0 else 'S'} {dms_lon[0]:.0f}° {dms_lon[1]:.0f}' {dms_lon[2]:.4f}'' {'E' if coords[1] > 0 else 'W'}"