pyedb 0.54.0__py3-none-any.whl → 0.56.0__py3-none-any.whl

pyedb/grpc/edb.py

@@ -65,7 +65,7 @@ import sys
 import tempfile
 import time
 import traceback
-from typing import Union
+from typing import Dict, List, Union
 import warnings
 from zipfile import ZipFile as zpf
 
@@ -99,8 +99,7 @@ from pyedb.grpc.database.layout_validation import LayoutValidation
 from pyedb.grpc.database.modeler import Modeler
 from pyedb.grpc.database.net.differential_pair import DifferentialPairs
 from pyedb.grpc.database.net.extended_net import ExtendedNets
-from pyedb.grpc.database.net.net_class import NetClass
-from pyedb.grpc.database.nets import Nets
+from pyedb.grpc.database.nets import NetClasses, Nets
 from pyedb.grpc.database.padstacks import Padstacks
 from pyedb.grpc.database.ports.ports import BundleWavePort, CoaxPort, GapPort, WavePort
 from pyedb.grpc.database.primitive.circle import Circle
@@ -137,6 +136,8 @@ from pyedb.ipc2581.ipc2581 import Ipc2581
 from pyedb.modeler.geometry_operators import GeometryOperators
 from pyedb.workflow import Workflow
 
+os.environ["no_proxy"] = "localhost,127.0.0.1"
+
 
 class Edb(EdbInit):
     """Main class for interacting with Ansys Electronics Desktop Database (EDB).
@@ -209,7 +210,6 @@ class Edb(EdbInit):
         technology_file: str = None,
         layer_filter: str = None,
         restart_rpc_server=False,
-        **kwargs,
     ):
         edbversion = get_string_version(edbversion)
         self._clean_variables()
@@ -371,6 +371,10 @@ class Edb(EdbInit):
         """Ansys Edb Core module."""
         return ansys.edb.core
 
+    @property
+    def ansys_em_path(self):
+        return self.base_path
+
     def _check_remove_project_files(self, edbpath: str, remove_existing_aedt: bool) -> None:
         aedt_file = os.path.splitext(edbpath)[0] + ".aedt"
         files = [aedt_file, aedt_file + ".lock"]
@@ -402,7 +406,7 @@ class Edb(EdbInit):
         self._differential_pairs = DifferentialPairs(self)
         self._extended_nets = ExtendedNets(self)
 
-    def value(self, val):
+    def value(self, val) -> float:
         """Convert a value into a pyedb value."""
         if isinstance(val, GrpcValue):
             return Value(val)
@@ -411,7 +415,7 @@ class Edb(EdbInit):
             return Value(GrpcValue(val, context), context)
 
     @property
-    def cell_names(self) -> [str]:
+    def cell_names(self) -> List[str]:
         """List of all cell names in the database.
 
         Returns
@@ -422,7 +426,7 @@ class Edb(EdbInit):
         return [cell.name for cell in self.active_db.top_circuit_cells]
 
     @property
-    def design_variables(self) -> dict[str, float]:
+    def design_variables(self) -> Dict[str, float]:
         """All design variables in active cell.
 
         Returns
@@ -433,7 +437,7 @@ class Edb(EdbInit):
         return {i: Value(self.active_cell.get_variable_value(i)) for i in self.active_cell.get_all_variable_names()}
 
     @property
-    def project_variables(self) -> dict[str, float]:
+    def project_variables(self) -> Dict[str, float]:
         """All project variables in database.
 
         Returns
@@ -455,7 +459,7 @@ class Edb(EdbInit):
         return LayoutValidation(self)
 
     @property
-    def variables(self) -> dict[str, float]:
+    def variables(self) -> Dict[str, float]:
         """All variables (project + design) in database.
 
         Returns
@@ -471,7 +475,7 @@ class Edb(EdbInit):
         return all_vars
 
     @property
-    def terminals(self) -> dict[str, Terminal]:
+    def terminals(self) -> Dict[str, Terminal]:
         """Terminals in active layout.
 
         Returns
@@ -482,7 +486,7 @@ class Edb(EdbInit):
         return {i.name: i for i in self.layout.terminals}
 
     @property
-    def excitations(self) -> dict[str, GapPort]:
+    def excitations(self) -> Dict[str, GapPort]:
         """All layout excitations.
 
         Returns
@@ -500,7 +504,7 @@ class Edb(EdbInit):
         return temp
 
     @property
-    def ports(self) -> dict[str, GapPort]:
+    def ports(self) -> Dict[str, GapPort]:
         """All ports in design.
 
         Returns
@@ -533,7 +537,7 @@ class Edb(EdbInit):
         return ports
 
     @property
-    def excitations_nets(self) -> [str]:
+    def excitations_nets(self) -> List[str]:
         """Nets with excitations defined.
 
         Returns
@@ -544,7 +548,7 @@ class Edb(EdbInit):
         return list(set([i.net.name for i in self.layout.terminals if not i.is_reference_terminal]))
 
     @property
-    def sources(self) -> dict[str, Terminal]:
+    def sources(self) -> Dict[str, Terminal]:
         """All layout sources.
 
         Returns
@@ -574,7 +578,7 @@ class Edb(EdbInit):
         return _vrms
 
     @property
-    def probes(self) -> dict[str, Terminal]:
+    def probes(self) -> Dict[str, Terminal]:
         """All layout probes.
 
         Returns
@@ -941,6 +945,7 @@ class Edb(EdbInit):
         ValueError
             If cell not found in database.
         """
+        self._layout = None
         if isinstance(value, str):
             _cell = [cell for cell in self.circuit_cells if cell.name == value]
             if _cell:
@@ -1060,16 +1065,16 @@ class Edb(EdbInit):
         return self._nets
 
     @property
-    def net_classes(self) -> NetClass:
+    def net_classes(self) -> NetClasses:
         """Net class management.
 
         Returns
         -------
-        dict[str, :class:`NetClass <pyedb.grpc.database.net.net_class.NetClass>`]
-            Net class names and objects.
+        :class:`NetClass <pyedb.grpc.database.nets.NetClasses>`
+            Net classes objects.
         """
         if self.active_db:
-            return {net.name: NetClass(self, net) for net in self.active_layout.net_classes}
+            return NetClasses(self)
 
     @property
     def extended_nets(self) -> ExtendedNets:
@@ -1119,7 +1124,10 @@ class Edb(EdbInit):
         :class:`Layout <pyedb.grpc.database.layout.layout.Layout>`
             Layout manipulation tools.
         """
-        return Layout(self)
+        if self._layout:
+            return self._layout
+        self._layout = Layout(self)
+        return self._layout
 
     @property
     def active_layout(self) -> Layout:
@@ -1401,7 +1409,7 @@ class Edb(EdbInit):
             print(command)
             temp_inputGDS = inputGDS.split(".gds")[0]
             self.edbpath = temp_inputGDS + ".aedb"
-            return self.open_edb()
+            return self.open()
 
     def _create_extent(
         self,
@@ -1420,6 +1428,7 @@ class Edb(EdbInit):
 
         if extent_type in [
             "Conforming",
+            "Conformal",
             GrpcExtentType.CONFORMING,
             1,
         ]:
@@ -1521,13 +1530,26 @@ class Edb(EdbInit):
             unite_polys = []
             for i in _polys:
                 if "PolygonData" not in str(i):
-                    obj_data = i.polygon_data.expand(expansion_size, tolerance, round_corner, round_extension)
+                    obj_data = i.polygon_data.expand(
+                        expansion_size,
+                        round_corner,
+                        round_extension,
+                        tolerance,
+                    )
                 else:
-                    obj_data = i.expand(expansion_size, tolerance, round_corner, round_extension)
+                    obj_data = i.expand(
+                        expansion_size,
+                        round_corner,
+                        round_extension,
+                        tolerance,
+                    )
                 if inlcude_voids_in_extents and "PolygonData" not in str(i) and i.has_voids and obj_data:
                     for void in i.voids:
                         void_data = void.polygon_data.expand(
-                            -1 * expansion_size, tolerance, round_corner, round_extension
+                            -1 * expansion_size,
+                            round_corner,
+                            round_extension,
+                            tolerance,
                         )
                         if void_data:
                             for v in list(void_data):
@@ -1992,11 +2014,15 @@ class Edb(EdbInit):
                 if isinstance(term, PadstackInstanceTerminal):
                     if term.net.name in reference_list:
                         pins_to_preserve.append(term.edb_uid)
+        delete_list = []
 
         for i in self.nets.nets.values():
             name = i.name
             if name not in all_list and name not in nets_to_preserve:
-                i.delete()
+                delete_list.append(i)
+                # i.delete()
+        for i in delete_list:
+            i.delete()
         reference_pinsts = []
         reference_prims = []
         reference_paths = []
@@ -2468,7 +2494,7 @@ class Edb(EdbInit):
         >>> # Export to HFSS project:
         >>> edb.export_hfss(r"C:/output", net_list=["SignalNet"])
         """
-        siwave_s = SiwaveSolve(self.edbpath, aedt_installer_path=self.base_path)
+        siwave_s = SiwaveSolve(self)
         return siwave_s.export_3d_cad("HFSS", path_to_output, net_list, num_cores, aedt_file_name, hidden=hidden)
 
     def export_q3d(
@@ -2504,7 +2530,7 @@ class Edb(EdbInit):
         >>> # Export to Q3D project:
         >>> edb.export_q3d(r"C:/output")
         """
-        siwave_s = SiwaveSolve(self.edbpath, aedt_installer_path=self.base_path)
+        siwave_s = SiwaveSolve(self)
         return siwave_s.export_3d_cad(
             "Q3D",
             path_to_output,
@@ -2547,7 +2573,7 @@ class Edb(EdbInit):
         >>> # Export to Maxwell project:
         >>> edb.export_maxwell(r"C:/output")
         """
-        siwave_s = SiwaveSolve(self.edbpath, aedt_installer_path=self.base_path)
+        siwave_s = SiwaveSolve(self)
         return siwave_s.export_3d_cad(
             "Maxwell",
             path_to_output,
@@ -2570,7 +2596,7 @@ class Edb(EdbInit):
         >>> # Solve with SIwave:
         >>> edb.solve_siwave()
         """
-        process = SiwaveSolve(self.edbpath, aedt_version=self.edbversion)
+        process = SiwaveSolve(self)
         try:
             self.close()
         except:
@@ -2621,7 +2647,7 @@ class Edb(EdbInit):
         list[str]
             Generated report files.
         """
-        process = SiwaveSolve(self.edbpath, aedt_version=self.edbversion)
+        process = SiwaveSolve(self)
         try:
             self.close()
         except:
@@ -2687,6 +2713,30 @@ class Edb(EdbInit):
         self.logger.info(f"Variable {variable_name} doesn't exists.")
         return False
 
+    def get_variable_value(self, variable_name):
+        """
+        Deprecated method to get the value of a variable.
+
+        .. deprecated:: pyedb 0.55.0
+           Use :func:`get_variable` instead.
+        """
+        warnings.warn(
+            "`get_variable_value` is deprecated use `get_variable` instead.",
+            DeprecationWarning,
+        )
+        return self.get_variable(variable_name)
+
+    def get_all_variable_names(self) -> List[str]:
+        """Method added for compatibility with grpc.
+
+        Returns
+        -------
+        List[str]
+            List of variable names.
+
+        """
+        return list(self.active_cell.get_all_variable_names())
+
     def add_project_variable(self, variable_name, variable_value, description=None) -> bool:
         """Add project variable.
 

pyedb/grpc/edb_init.py

@@ -31,8 +31,8 @@ import time
 import ansys.edb.core.database as database
 
 from pyedb import __version__
-from pyedb.edb_logger import pyedb_logger
 from pyedb.generic.general_methods import env_path, env_value, is_linux
+from pyedb.generic.settings import settings
 from pyedb.grpc.rpc_session import RpcSession
 
 
@@ -40,7 +40,7 @@ class EdbInit(object):
     """Edb Dot Net Class."""
 
     def __init__(self, edbversion):
-        self.logger = pyedb_logger
+        self.logger = settings.logger
         self._db = None
         self.edbversion = edbversion
         self.logger.info("Logger is initialized in EDB.")
@@ -72,7 +72,7 @@ class EdbInit(object):
 
     @staticmethod
     def _signal_handler(signum=None, frame=None):
-        RpcSession.kill()
+        RpcSession.kill_all_instances()
 
     @property
     def db(self):

pyedb/grpc/rpc_session.py

@@ -21,7 +21,7 @@
 # SOFTWARE.
 
 import os
-from random import randint
+import secrets
 import sys
 import time
 
@@ -34,8 +34,8 @@ from ansys.edb.core.utility.io_manager import (
 import psutil
 
 from pyedb import __version__
-from pyedb.edb_logger import pyedb_logger
 from pyedb.generic.general_methods import env_path, env_value, is_linux
+from pyedb.generic.settings import settings
 from pyedb.misc.misc import list_installed_ansysem
 
 latency_delay = 0.1
@@ -80,12 +80,12 @@ class RpcSession:
         if not edb_version:  # pragma: no cover
             try:
                 edb_version = "20{}.{}".format(list_installed_ansysem()[0][-3:-1], list_installed_ansysem()[0][-1:])
-                pyedb_logger.info("Edb version " + edb_version)
+                settings.logger.info("Edb version " + edb_version)
             except IndexError:
                 raise Exception("No ANSYSEM_ROOTxxx is found.")
-        pyedb_logger.info("Logger is initialized in EDB.")
-        pyedb_logger.info("legacy v%s", __version__)
-        pyedb_logger.info("Python version %s", sys.version)
+        settings.logger.info("Logger is initialized in EDB.")
+        settings.logger.info("legacy v%s", __version__)
+        settings.logger.info("Python version %s", sys.version)
         if is_linux:
             if env_value(edb_version) in os.environ:
                 RpcSession.base_path = env_path(edb_version)
@@ -106,18 +106,18 @@ class RpcSession:
 
         if RpcSession.pid:
             if restart_server:
-                pyedb_logger.logger.info("Restarting RPC server")
+                settings.logger.logger.info("Restarting RPC server")
                 RpcSession.kill()
                 RpcSession.__start_rpc_server()
             else:
-                pyedb_logger.info(f"Server already running on port {RpcSession.port}")
+                settings.logger.info(f"Server already running on port {RpcSession.port}")
         else:
             RpcSession.__start_rpc_server()
             if RpcSession.rpc_session:
                 RpcSession.server_pid = RpcSession.rpc_session.local_server_proc.pid
-                pyedb_logger.info(f"Grpc session started: pid={RpcSession.server_pid}")
+                settings.logger.info(f"Grpc session started: pid={RpcSession.server_pid}")
             else:
-                pyedb_logger.error("Failed to start EDB_RPC_server process")
+                settings.logger.error("Failed to start EDB_RPC_server process")
 
     @staticmethod
     def __get_process_id():
@@ -135,7 +135,7 @@ class RpcSession:
         time.sleep(latency_delay)
         if RpcSession.rpc_session:
             RpcSession.pid = RpcSession.rpc_session.local_server_proc.pid
-            pyedb_logger.logger.info("Grpc session started")
+            settings.logger.logger.info("Grpc session started")
 
     @staticmethod
     def kill():
@@ -170,11 +170,12 @@ class RpcSession:
     @staticmethod
     def __get_random_free_port():
         """"""
-        port = randint(49152, 65535)
+        secure_random = secrets.SystemRandom()
+        port = secure_random.randint(49152, 65535)
         while True:
             used_ports = [conn.laddr[1] for conn in psutil.net_connections()]
             if port in used_ports:
-                port = randint(49152, 65535)
+                port = secure_random.randint(49152, 65535)
             else:
                 break
         return port