Merge remote-tracking branch 'origin/main' into port-checks

gdsfactory · Sep 25, 2023 · 5156fa6 · 5156fa6
2 parents 23b83ac + 0f05fd5
commit 5156fa6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
@@ -16,6 +16,7 @@ nav:
     - KCell & Instance: notebooks/01_references.py
     - DRC utils: notebooks/02_DRC.py
     - Enclosures: notebooks/03_Enclosures.py
+    - Multiple KCLs: notebooks/04_KCL.py
   - Config Class: config.md
   - API: reference/
   - Changelog: changelog.md

diff --git a/docs/source/dosdonts.md b/docs/source/dosdonts.md
@@ -5,5 +5,6 @@
 
 ## Don'ts
 
-* Do not use "function_name" as a function parameter when using `@kf.cell` decorator,
+* "function_name" as a function parameter when using `@kf.cell` decorator,
   it will be overwritten by the function name used to create the cell
+* "self", "cls" in `@cell` functions, they will be dropped.
diff --git a/docs/source/notebooks/04_KCL.py b/docs/source/notebooks/04_KCL.py
@@ -12,7 +12,9 @@
 #     name: python3
 # ---
 
-# # KCLayout / PDK: Using multiple KCLayout objects as PDKs or Libraries of KCells and parametric KCell-Functions
+# # Multi - KCLayout / PDK
+
+# Using multiple KCLayout objects as PDKs or Libraries of KCells and parametric KCell-Functions
 
 # ## Use multiple KCLayout objects as PDKs/Libraries
 #

diff --git a/src/kfactory/kcell.py b/src/kfactory/kcell.py
@@ -3944,9 +3944,13 @@ def wrapped_cell(
                     cell.name = name
                 if set_settings:
                     settings = cell.settings.model_dump()
+                    if "self" in params:
+                        settings["function_name"] = params["self"].__class__.__name__
+                    else:
+                        settings["function_name"] = f.__name__
+                    params.pop("self", None)
+                    params.pop("cls", None)
                     settings.update(params)
-                    if set_name:
-                        settings["function_name"] = name
                     cell._settings = KCellSettings(**settings)
                 info = cell.info.model_dump()
                 for name, value in cell.info: