fix merge and styling

Author: cbellot000

ansys/dpf/core/common.py

@@ -9,7 +9,6 @@
 from ansys.grpc.dpf import base_pb2, field_definition_pb2
 
 
-
 def _camel_to_snake_case(name):
     return re.sub(r"(?<!^)(?=[A-Z])", "_", name).lower()
 

ansys/dpf/core/core.py

@@ -26,6 +26,7 @@
 else:
     CONFIGURATION = "release"
 
+
 def load_library(filename, name="", symbol="LoadOperators", server=None):
     """Dynamically load an operators library for dpf.core.
     Code containing this library's operators is generated in
@@ -95,7 +96,7 @@ def upload_file_in_tmp_folder(file_path, new_file_name=None, server=None):
 
 
 def upload_files_in_folder(
-    to_server_folder_path, client_folder_path, specific_extension=None, server=None
+        to_server_folder_path, client_folder_path, specific_extension=None, server=None
 ):
     """Upload all the files from a folder of the client
     to the target server folder path.
@@ -160,7 +161,7 @@ def download_file(server_file_path, to_client_file_path, server=None):
 
 
 def download_files_in_folder(
-    server_folder_path, to_client_folder_path, specific_extension=None, server=None
+        server_folder_path, to_client_folder_path, specific_extension=None, server=None
 ):
     """Download all the files from a folder of the server
     to the target client folder path
@@ -376,7 +377,7 @@ def load_library(self, filename, name="", symbol="LoadOperators"):
         # TODO: fix code generation upload posix
         import os
 
-        if self._server().os != 'posix' or (not self._server().os and os.name!= 'posix'):
+        if self._server().os != 'posix' or (not self._server().os and os.name != 'posix'):
             local_dir = os.path.dirname(os.path.abspath(__file__))
             LOCAL_PATH = os.path.join(local_dir, "operators")
 
@@ -419,8 +420,8 @@ def _get_server_info(self):
             "server_port": response.port,
             "server_process_id": response.processId,
             "server_version": str(response.majorVersion)
-            + "."
-            + str(response.minorVersion),
+                              + "."
+                              + str(response.minorVersion),
         }
         if hasattr(response, "properties"):
             for key in response.properties:
@@ -487,28 +488,28 @@ def download_file(self, server_file_path, to_client_file_path):
         bar = None
         tot_size = sys.float_info.max
         for i in range(0, len(chunks.initial_metadata())):
-            if chunks.initial_metadata()[i].key == u"size_tot" :
-                tot_size = int(chunks.initial_metadata()[i].value)*1E-3
+            if chunks.initial_metadata()[i].key == u"size_tot":
+                tot_size = int(chunks.initial_metadata()[i].value) * 1E-3
                 bar = _common_progress_bar("Downloading...",
                                            unit="KB",
                                            tot_size=tot_size)
         if not bar:
-        bar = _common_progress_bar("Downloading...", unit="KB")
-        bar.start()
+            bar = _common_progress_bar("Downloading...", unit="KB")
+            bar.start()
         i = 0
         with open(to_client_file_path, "wb") as f:
             for chunk in chunks:
                 f.write(chunk.data.data)
                 i += len(chunk.data.data) * 1e-3
                 try:
-                    bar.update(min(i,tot_size))
-                except :
+                    bar.update(min(i, tot_size))
+                except:
                     pass
         bar.finish()
 
     @protect_grpc
     def download_files_in_folder(
-        self, server_folder_path, to_client_folder_path, specific_extension=None
+            self, server_folder_path, to_client_folder_path, specific_extension=None
     ):
         """Download all the files from a folder of the server
         to the target client folder path
@@ -555,8 +556,8 @@ def download_files_in_folder(
             if chunk.data.server_file_path != server_path:
                 server_path = chunk.data.server_file_path
                 if (
-                    specific_extension == None
-                    or pathlib.Path(server_path).suffix == "." + specific_extension
+                        specific_extension == None
+                        or pathlib.Path(server_path).suffix == "." + specific_extension
                 ):
                     separator = self._get_separator(server_path)
                     server_subpath = server_path.replace(
@@ -598,7 +599,7 @@ def download_files_in_folder(
 
     @protect_grpc
     def upload_files_in_folder(
-        self, to_server_folder_path, client_folder_path, specific_extension=None
+            self, to_server_folder_path, client_folder_path, specific_extension=None
     ):
         """Upload all the files from a folder of the client
         to the target server folder path.
@@ -643,24 +644,24 @@ def upload_files_in_folder(
         return server_paths
 
     def _upload_and_get_server_path(
-        self,
-        specific_extension,
-        f,
-        filename,
-        server_paths,
-        to_server_folder_path,
-        subdirectory=None,
+            self,
+            specific_extension,
+            f,
+            filename,
+            server_paths,
+            to_server_folder_path,
+            subdirectory=None,
     ):
         separator = self._get_separator(to_server_folder_path)
 
         if subdirectory is not None:
             to_server_file_path = (
-                to_server_folder_path + separator + subdirectory + separator + filename
+                    to_server_folder_path + separator + subdirectory + separator + filename
             )
         else:
             to_server_file_path = to_server_folder_path + separator + filename
         if ((specific_extension is not None) and (f.endswith(specific_extension))) or (
-            specific_extension is None
+                specific_extension is None
         ):
             server_path = self._stub.UploadFile(
                 self.__file_chunk_yielder(

ansys/dpf/core/dpf_operator.py

@@ -610,6 +610,7 @@ def available_operator_names(server=None):
         arr.extend(re.split(r'[\x00-\x08]', chunk.array.decode('utf-8')))
     return arr
 
+
 def _write_output_type_to_proto_style(output_type, request):
     subtype = ""
     stype = ""
@@ -715,7 +716,7 @@ def _convertOutputMessageToPythonInstance(out, output_type, server):
         return workflow.Workflow(server=server, workflow=toconvert)
 
 
-def _fillConnectionRequestMessage(request, inpt, pin_out=0):
+def _fillConnectionRequestMessage(request, inpt, server, pin_out=0):
     from ansys.dpf.core import (
         collection,
         cyclic_support,
@@ -727,7 +728,6 @@ def _fillConnectionRequestMessage(request, inpt, pin_out=0):
         workflow,
     )
 
-
     if isinstance(inpt, str):
         request.str = inpt
     elif isinstance(inpt, bool):

ansys/dpf/core/field_base.py

@@ -12,13 +12,13 @@ class _FieldBase:
     """Contains base APIs for all implementations that follow DPF's field concept."""
 
     def __init__(
-        self,
-        nentities=0,
-        nature=natures.vector,
-        location=locations.nodal,
-        is_property_field=False,
-        field=None,
-        server=None,
+            self,
+            nentities=0,
+            nature=natures.vector,
+            location=locations.nodal,
+            is_property_field=False,
+            field=None,
+            server=None,
     ):
         """Initialize the field either with an optional field message or by connecting to a stub."""
         if server is None:
@@ -490,10 +490,10 @@ def _set_data(self, data):
         else:
             if isinstance(data, (np.ndarray, np.generic)):
                 if (
-                    0 != self.size
-                    and self.component_count > 1
-                    and data.size // self.component_count
-                    != data.size / self.component_count
+                        0 != self.size
+                        and self.component_count > 1
+                        and data.size // self.component_count
+                        != data.size / self.component_count
                 ):
                     raise ValueError(
                         f"An array of shape {self.shape} is expected and "
@@ -609,10 +609,10 @@ def get_entity_data(self, index):
             last_index = self._ncomp * (index + 1) - 1
         if self._is_property_field:
             array = np.array(
-                self._data_copy[first_index : last_index + 1], dtype=np.int32
+                self._data_copy[first_index: last_index + 1], dtype=np.int32
             )
         else:
-            array = np.array(self._data_copy[first_index : last_index + 1])
+            array = np.array(self._data_copy[first_index: last_index + 1])
 
         if self._ncomp > 1:
             return array.reshape((array.size // self._ncomp, self._ncomp))
@@ -690,7 +690,7 @@ def append(self, data, scopingid):
             if not isinstance(data[0], int) and not isinstance(data[0], np.int32):
                 raise errors.InvalidTypeError("data", "list of int")
         if (len(data) > 0 and isinstance(data, list)) or isinstance(
-            data, (np.ndarray, np.generic)
+                data, (np.ndarray, np.generic)
         ):
             data = np.array(data).flatten().tolist()
 
@@ -876,7 +876,6 @@ def scoping(self):
         """
         return self._scoping_copy
 
-
     @scoping.setter
     @_setter
     def scoping(self, data):

ansys/dpf/core/model.py

@@ -125,13 +125,10 @@ def results(self):
 
             Examples
             --------
-            Create a stress result from the model and choose its time and mesh scopings.
-
             >>> from ansys.dpf import core as dpf
             >>> from ansys.dpf.core import examples
             >>> model = dpf.Model(examples.electric_therm)
             >>> v = model.results.electric_potential
-            >>> rf = model.results.reaction_force
             >>> dissip = model.results.thermal_dissipation_energy
 
         Examples
@@ -246,11 +243,11 @@ def mesh_by_default(self, value):
 
 class Metadata:
     """Contains the metadata of a data source.
-        
+
     Parameters
     ----------
-    data_sources :
-        
+    data_sources : DataSources
+
     server : server.DPFServer
         Server with the channel connected to the remote or local instance.
 

ansys/dpf/core/nodes.py

@@ -245,7 +245,6 @@ def nodal_connectivity_field(self):
         """
         return self._mesh.field_of_properties(nodal_properties.nodal_connectivity)
 
-
     @protect_grpc
     def _get_coordinates_field(self):
         """Retrieve the coordinates field."""

ansys/dpf/core/time_freq_support.py

@@ -364,7 +364,7 @@ def _get_frequencies(self, cplx=False):
         attributes_list = self._get_attributes_list()
         if cplx and "freq_complex" in attributes_list:
             return attributes_list["freq_complex"]
-        elif cplx!=True and "freq_real" in attributes_list:
+        elif cplx != True and "freq_real" in attributes_list:
             return attributes_list["freq_real"]
 
     def _get_rpms(self):

ansys/dpf/core/workflow.py

@@ -68,8 +68,7 @@ def __init__(self, workflow=None, server=None):
             self.__create_from_stream(workflow)
         elif workflow is None or remote_copy_needed:
             self.__send_init_request(workflow)
-        
-            
+
     @protect_grpc
     def connect(self, pin_name, inpt, pin_out=0):
         """Connect an input on the workflow using a pin name.
@@ -144,7 +143,11 @@ def get_output(self, pin_name, output_type):
                 out = out_future.result()
             else:
                 out = self._stub.Get(request)
-            return dpf_operator._convertOutputMessageToPythonInstance(out, output_type, self._server)
+            return dpf_operator._convertOutputMessageToPythonInstance(
+                out,
+                output_type,
+                self._server
+            )
         else:
             raise ValueError(
                 "please specify an output type to get the workflow's output"

examples/00-basic/00-basic_example.py

@@ -40,7 +40,6 @@
 model = dpf.Model(examples.simple_bar)
 print(model)
 
-
 ###############################################################################
 # Model Metadata
 # ~~~~~~~~~~~~~~
@@ -51,19 +50,16 @@
 metadata = model.metadata
 print(metadata.result_info)
 
-
 ###############################################################################
 # To print the mesh region:
 
 print(metadata.meshed_region)
 
-
 ###############################################################################
 # To print the time or frequency of the results:
 
 print(metadata.time_freq_support)
 
-
 ###############################################################################
 # Extracting Displacement Results
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

examples/00-basic/01-basic_operators.py

@@ -38,7 +38,6 @@
 print(disp_op.inputs)
 print(disp_op.outputs)
 
-
 ###############################################################################
 # Compute the Maximum Normalized Displacement
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -73,7 +72,6 @@
 # it is much easier to reference available operators by first running:
 print(model.results)
 
-
 ###############################################################################
 # Create the displacement operator directly from the ``results`` property:
 disp_op = model.results.displacement()