berryworld 1.0.0.196257__py3-none-any.whl → 1.0.0.196751__py3-none-any.whl

berryworld/__init__.py

@@ -1,5 +1,5 @@
 from .xml_parser import XMLparser
-from .handy_mix import HandyMix, URLResolver
+from .handy_mix import HandyMix
 from .transportation_solver import TransportationAlgorithm
 from .allocation_solver import AllocationSolver
 from .pickle_management import PickleManagement

berryworld/handy_mix.py

@@ -226,39 +226,15 @@ class HandyMix:
         :param data: DataFrame to transform its integer columns to strings
         :return: DataFrame with its columns translated to strings
         """
-        float_cols = data.columns[data.dtypes == 'float']
-        for float_col in float_cols:
-            if data[float_col].dtype == float:
-                if all(['.0' in val for val in data[float_col].loc[~data[float_col].isnull()].astype(str).values]):
-                    data.loc[~data[float_col].isnull(), float_col] = data.loc[
-                        ~data[float_col].isnull(), float_col].astype(str).str.replace(
-                        '.0', '', regex=True).infer_objects(copy=False)
-
-        return data
-
-
-class URLResolver:
-    @staticmethod
-    def resolve_url_requested(url_requested, endpoint_requested):
-        """Resolve the URL requested.
-        :param url_requested: The base url that includes the project root
-        :param endpoint_requested: The endpoint that will be added to the base url
-        """
-        url_requested = str(url_requested)
-        endpoint_requested = str(endpoint_requested)
-
-        domains = ["berryworld.com", "berryworld.net"]
+        float_cols = data.select_dtypes(include=['float']).columns
 
-        for domain in domains:
-            if domain in url_requested:
-                if url_requested.endswith('/'):
-                    url_requested = url_requested.rstrip('/')
+        for float_col in float_cols:
+            mask = ~data[float_col].isnull()
+            values = data.loc[mask, float_col]
 
-                path_after_domain = ''
-                if domain in endpoint_requested:
-                    path_after_domain = endpoint_requested.split(f"{domain}", 1)[-1]
+            data[float_col] = data[float_col].astype(object)
 
-                url_requested = f"{url_requested}{path_after_domain}"
-                break
+            if ((values % 1) == 0).all():
+                data.loc[mask, float_col] = values.astype(int).astype(str)
 
-        return url_requested
+        return data

{berryworld-1.0.0.196257.dist-info → berryworld-1.0.0.196751.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: berryworld
-Version: 1.0.0.196257
+Version: 1.0.0.196751
 Summary: Handy classes to improve ETL processes
 Home-page: https://www.berryworld.com
 Author: BerryWorld ltd

{berryworld-1.0.0.196257.dist-info → berryworld-1.0.0.196751.dist-info}/RECORD

@@ -1,4 +1,4 @@
-berryworld/__init__.py,sha256=x0BONOWraAH1SG_BRHWpZNarRMUqoRHKkdASKMtAdhc,1140
+berryworld/__init__.py,sha256=y8vZZSv7up3H-uYHEGPDW_ucf-ynzIsoRY6jJvIPsrE,1127
 berryworld/aks_logs.py,sha256=Gb2_cokiZbEX01Yoptd0MxpDociaug-GrXdwliyxFBo,2293
 berryworld/allocation_solver.py,sha256=asFtaCAze6-eHUGWXA0kAp67UBS-Upj1KKdrVLj_ttQ,8513
 berryworld/app_logs.py,sha256=MKzKPYd3JuPfOQNAapIgaeZeFHw1z_w2mbn9I6QCADE,4180
@@ -9,7 +9,7 @@ berryworld/devops.py,sha256=7mRbyZPGzk5ox-6J2etv3NxCcfP4cprG0_Xelh7prn8,9776
 berryworld/email_con.py,sha256=CVyEDVnc_iVeRTwJgIU31ToFgyix7L2yn4Ih9Wu7I5s,15806
 berryworld/email_logging.py,sha256=LeSrTExhQhar49gJR2wGC1dS0lqsNpFl9pS3eYWqnuo,4936
 berryworld/generate_env.py,sha256=kJuBb0OOYjoa2gyAnZHgn3gpoEZ8rPbMhnKcTYfENUk,11875
-berryworld/handy_mix.py,sha256=dN33Pya8fh5YBR6jSDsxbAle8rKpPYebMbasf6kcaZ4,10734
+berryworld/handy_mix.py,sha256=SqJ3UjIjmIOgjbp-_1eyKQJ3OJLN7OfpDQIASvjNZ_Q,9672
 berryworld/logging.py,sha256=tOxzaFALQm3aVVEc3I7t8MU6PwgUI9VSnzNCH9yRryo,1013
 berryworld/logic_apps.py,sha256=a0uU4tNO3v2w7grdBv-OOx4hUf7VBIerJpwZ9U-29dQ,14591
 berryworld/microsoft_teams.py,sha256=8uPo0yku-euBj2VdzBoZCeX3IcsCCOqISLqaVZUVxfA,16030
@@ -26,12 +26,12 @@ berryworld/verify_keys.py,sha256=X7VUHqYDklWPDO0bGVHIOXeLq5Qi4fZRZbHYw5x7UnA,435
 berryworld/vivantio.py,sha256=QfZo0UKqkzVRg_LyiwivNd3aEup4TH57x4KxLZkCJwc,10627
 berryworld/vivantio_logging.py,sha256=ciy7gA4u3FrgUIpEBnMgocbNPp6jcu9TPoy-kLcrTZU,5736
 berryworld/xml_parser.py,sha256=HWD71NaTN3DaIOGT6Wzxs4CEsroFhGQwe9iPLIL80Co,957
-berryworld-1.0.0.196257.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.196751.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_allocation_config.py,sha256=e12l6fE9U57eSPS35g6ekJ_hol7-RHg89JV60_m1BlE,4633
 tests/test_handy_mix_config.py,sha256=Un56mz9KJmdn4K4OwzHAHLSRzDU1Xv2nFrONNuzOG04,2594
 tests/test_xml_parser.py,sha256=3QTlhFEd6KbK6nRFKZnc35tad6wqukTbe4QrFi8mr_8,859
-berryworld-1.0.0.196257.dist-info/METADATA,sha256=ZXmujcDreqDhz8QvyNP0MwAcrl_0I6vWhATexM5_eJg,1445
-berryworld-1.0.0.196257.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-berryworld-1.0.0.196257.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.196257.dist-info/RECORD,,
+berryworld-1.0.0.196751.dist-info/METADATA,sha256=IjOCECKPRS5Xc2rhak7bE86CnQrUbYfVmijbjX8gMLY,1445
+berryworld-1.0.0.196751.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+berryworld-1.0.0.196751.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.196751.dist-info/RECORD,,