reorganize docs and better where_ method

Author: essicolo

.gitignore

@@ -88,7 +88,7 @@ ipython_config.py
 # pyenv
 #   For a library or package, you might want to ignore these files since the code is
 #   intended to run in multiple environments; otherwise, check them in:
-# .python-version
+.python-version
 
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
@@ -161,6 +161,4 @@ cython_debug/
 docs/_build/
 
 # uv stuff
-uv.lock
-
-.python-version
+uv.lock

docs/_images/logo.png docs/_static/logo.png

@@ -0,0 +1,49 @@
+import os
+import sys
+
+# Ajoute le répertoire parent au chemin Python
+sys.path.insert(0, os.path.abspath('..'))
+print("Python path:", sys.path)
+
+# Information sur le projet
+project = 'seekwellpandas'
+copyright = '2024, Essi Parent'
+author = 'Essi Parent'
+release = '0.2'
+
+# Extensions Sphinx
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.napoleon',
+    'nbsphinx',
+    'sphinx.ext.viewcode',  # Ajoute des liens vers le code source
+    'sphinx.ext.githubpages',  # Support pour GitHub Pages
+]
+
+# Configuration de base
+master_doc = 'index'
+source_suffix = ['.rst', '.md']
+
+# Configuration de la sortie
+htmlhelp_basename = 'seekwellpandasDoc'
+templates_path = ['_templates']
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+
+# Thème et style
+html_theme = 'alabaster'
+html_static_path = ['_static']
+html_logo = '_static/logo.png'
+
+# Configuration supplémentaire pour une meilleure documentation
+autodoc_member_order = 'bysource'
+napoleon_google_docstring = True
+napoleon_numpy_docstring = True
+napoleon_include_init_with_doc = False
+napoleon_include_private_with_doc = False
+napoleon_include_special_with_doc = True
+napoleon_use_admonition_for_examples = False
+napoleon_use_admonition_for_notes = False
+napoleon_use_admonition_for_references = False
+napoleon_use_ivar = False
+napoleon_use_param = True
+napoleon_use_rtype = True

docs/_images/logo.svg docs/_static/logo.svg

@@ -56,5 +56,5 @@ This project is licensed under the GPLv3 License.
    :caption: Contents:
 
    about
-   _examples/basic-usage
+   basic-usage
    api

docs/conf.py

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "seekwellpandas"
-dynamic = ["version"]
+revision = 0.2
 authors = [
     {name = "Essi Parent", email = "[email protected]"},
 ]
@@ -21,6 +21,9 @@ dependencies = [
     "pandas-flavor>=0.3.0"
 ]
 
+[project.optional-dependencies]
+dev = ["bump-my-version", "marimo", "uv"]
+
 [tool.setuptools_scm]
 write_to = "src/seekwellpandas/_version.py"
 

docs/about.rst docs/source/about.rst

@@ -19,5 +19,3 @@
 )
 
 from .methods import __all__
-
-__version__ = "0.2"

docs/api.rst docs/source/api.rst

@@ -1,3 +1,4 @@
+import re
 import pandas as pd
 import pandas_flavor as pf
 import warnings
@@ -57,20 +58,49 @@ def _process_column(col, all_columns, selected_columns, excluded_columns):
         selected_columns.add(col)
 
 @pf.register_dataframe_method
-def where_(df, condition):
+def where2_(df: DataFrame, condition: str) -> DataFrame:
     """
-    Filter the DataFrame based on a condition.
-
+    Filter the DataFrame based on SQL-like conditions.
+    
     Parameters:
     df (pd.DataFrame): The DataFrame to filter.
-    condition (str or list): The condition(s) to filter by. Can be a string or a list of strings.
-
+    condition (str): A string representing the condition in SQL-like syntax.
+    
     Returns:
     pd.DataFrame: A filtered DataFrame.
-    """
-    if isinstance(condition, list):
-        condition = ' and '.join(f'({cond})' for cond in condition)
-    return df.query(condition)
+    
+    Examples:
+    df.where_('column > 5')
+    df.where_('column in value1, value2, value3')
+    df.where_('column1 == value and column2 > 10')
+    """
+    def parse_condition(cond):
+        # Parse 'in' conditions
+        in_match = re.match(r'(\w+)\s+in\s+(.*)', cond)
+        if in_match:
+            column, values = in_match.groups()
+            values = [v.strip() for v in values.split(',')]
+            return f"{column}.isin({values})"
+        
+        # Parse other conditions
+        ops = {'==': '==', '!=': '!=', '>': '>', '<': '<', '>=': '>=', '<=': '<='}
+        for op in ops:
+            if op in cond:
+                column, value = cond.split(op)
+                return f"{column.strip()} {ops[op]} {value.strip()}"
+        
+        return cond
+
+    # Split the condition string into individual conditions
+    conditions = [c.strip() for c in re.split(r'\s+and\s+|\s+or\s+', condition)]
+    parsed_conditions = [parse_condition(c) for c in conditions]
+    
+    # Reconstruct the query string
+    query = re.sub(r'\s+and\s+|\s+or\s+', lambda m: m.group(0), condition)
+    for original, parsed in zip(conditions, parsed_conditions):
+        query = query.replace(original, parsed)
+    
+    return df.query(query)
 
 @pf.register_dataframe_method
 def group_by(df, *columns):