dshield-parser 0.1.5__tar.gz → 0.1.7__tar.gz

{dshield_parser-0.1.5 → dshield_parser-0.1.7}/PKG-INFO

@@ -1,13 +1,21 @@
 Metadata-Version: 2.4
 Name: dshield_parser
-Version: 0.1.5
-Summary: This program has utilities to download, parse and enrich DSHield honeypot data
+Version: 0.1.7
+Summary: This program has utilities to download, parse and enrich DShield honeypot data
 Home-page: https://github.com/jslagrew/dshield-parser
 Author: Jesse La Grew
 Author-email: jlagrew.github@proton.me
-Requires-Python: >=3.12.7
+Requires-Python: >=3.12
+Requires-Dist: matplotlib>=3.6.3
+Requires-Dist: numpy>=1.26.0
+Requires-Dist: pandas>=2.0.3
+Requires-Dist: requests>=2.32.3
+Requires-Dist: scikit-learn>=1.2.2
+Requires-Dist: shodan>=1.28.0
+Requires-Dist: SQLAlchemy>=2.0.31
 Dynamic: author
 Dynamic: author-email
 Dynamic: home-page
+Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{dshield_parser-0.1.5 → dshield_parser-0.1.7}/dshield_parser/utils/json.py

@@ -22,8 +22,19 @@ def _groupby_size(df):
     In pandas 3.0, 'size' became a reserved GroupBy method name and can no longer
     be used as a column selector after groupby(). This helper renames the column
     temporarily to avoid the conflict.
+    Handles edge cases where df is empty or does not yet have a 'size' column.
     """
+    if df.empty:
+        return df
+    if 'size' not in df.columns:
+        # No size column yet — just do a count groupby and name it 'size'
+        group_cols = df.columns.tolist()
+        result = df.groupby(group_cols, as_index=False, dropna=False).size()
+        return result
     group_cols = df.columns.difference(['size']).tolist()
+    if not group_cols:
+        # Only column is 'size', nothing meaningful to group by
+        return df
     result = df.rename(columns={'size': '_count'})
     result = result.groupby(result.columns.difference(['_count']).tolist(), as_index=False, dropna=False)['_count'].sum()
     result = result.rename(columns={'_count': 'size'})

{dshield_parser-0.1.5 → dshield_parser-0.1.7}/dshield_parser.egg-info/PKG-INFO

@@ -1,13 +1,21 @@
 Metadata-Version: 2.4
 Name: dshield_parser
-Version: 0.1.5
-Summary: This program has utilities to download, parse and enrich DSHield honeypot data
+Version: 0.1.7
+Summary: This program has utilities to download, parse and enrich DShield honeypot data
 Home-page: https://github.com/jslagrew/dshield-parser
 Author: Jesse La Grew
 Author-email: jlagrew.github@proton.me
-Requires-Python: >=3.12.7
+Requires-Python: >=3.12
+Requires-Dist: matplotlib>=3.6.3
+Requires-Dist: numpy>=1.26.0
+Requires-Dist: pandas>=2.0.3
+Requires-Dist: requests>=2.32.3
+Requires-Dist: scikit-learn>=1.2.2
+Requires-Dist: shodan>=1.28.0
+Requires-Dist: SQLAlchemy>=2.0.31
 Dynamic: author
 Dynamic: author-email
 Dynamic: home-page
+Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{dshield_parser-0.1.5 → dshield_parser-0.1.7}/dshield_parser.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ dshield_parser/__main__.py
 dshield_parser.egg-info/PKG-INFO
 dshield_parser.egg-info/SOURCES.txt
 dshield_parser.egg-info/dependency_links.txt
+dshield_parser.egg-info/requires.txt
 dshield_parser.egg-info/top_level.txt
 dshield_parser/cowrie_processor/__init__.py
 dshield_parser/cowrie_processor/__main__.py

dshield_parser-0.1.7/dshield_parser.egg-info/requires.txt

@@ -0,0 +1,7 @@
+matplotlib>=3.6.3
+numpy>=1.26.0
+pandas>=2.0.3
+requests>=2.32.3
+scikit-learn>=1.2.2
+shodan>=1.28.0
+SQLAlchemy>=2.0.31

{dshield_parser-0.1.5 → dshield_parser-0.1.7}/setup.py

@@ -2,10 +2,10 @@ import setuptools
 
 setuptools.setup(
     name="dshield_parser",
-    version="0.1.5",
+    version="0.1.7",
     author="Jesse La Grew",
     author_email="jlagrew.github@proton.me",
-    description="This program has utilities to download, parse and enrich DSHield honeypot data",
+    description="This program has utilities to download, parse and enrich DShield honeypot data",
     url="https://github.com/jslagrew/dshield-parser",
     packages=setuptools.find_packages(),
     #entry_points = {
@@ -13,6 +13,14 @@ setuptools.setup(
     #    ['summarize_urls=utils.json:summarize_urls',
     #     'summarize_urls=utils.json:summarize_commands']
     #},
-    python_requires='>=3.12.7'
-    #install_requires=['matplotlib', 'numpy', 'pandas', 'Requests', 'scikit_learn', 'shodan', 'SQLAlchemy']
+    python_requires='>=3.12',
+    install_requires=[
+        "matplotlib>=3.6.3",
+        "numpy>=1.26.0",
+        "pandas>=2.0.3",
+        "requests>=2.32.3",
+        "scikit-learn>=1.2.2",
+        "shodan>=1.28.0",
+        "SQLAlchemy>=2.0.31",
+    ],
 )