completor 1.0.1__py3-none-any.whl → 1.1.1__py3-none-any.whl

completor/create_output.py

@@ -76,7 +76,8 @@ def format_output(well: Well, case: ReadCasefile, figure_name: str | None = None
         if df_annulus.empty:
             logger.info("No annular flow in Well : %s Lateral : %d", well.well_name, lateral.lateral_number)
 
-        start_segment, start_branch = _update_segmentbranch(lateral.df_device, df_annulus)
+        if not lateral.df_device.empty:
+            start_segment, start_branch = _update_segmentbranch(lateral.df_device, df_annulus)
 
         lateral.df_tubing = _connect_lateral(well.well_name, lateral, top, well, case)
 
@@ -234,15 +235,11 @@ def _update_segmentbranch(df_device: pd.DataFrame, df_annulus: pd.DataFrame) ->
     Returns:
         The numbers for starting segment and branch.
 
-    Raises:
-        ValueError: If there is neither device nor annulus data.
     """
-    if df_annulus.empty and df_device.empty:
-        raise ValueError("Cannot determine starting segment and branch without device and annulus data.")
     if df_annulus.empty and not df_device.empty:
         start_segment = max(df_device[Headers.START_SEGMENT_NUMBER].to_numpy()) + 1
         start_branch = max(df_device[Headers.BRANCH].to_numpy()) + 1
-    else:
+    elif not df_annulus.empty:
         start_segment = max(df_annulus[Headers.START_SEGMENT_NUMBER].to_numpy()) + 1
         start_branch = max(df_annulus[Headers.BRANCH].to_numpy()) + 1
     return start_segment, start_branch

completor/main.py

@@ -7,7 +7,6 @@ import os
 import re
 import time
 
-import pandas as pd
 from tqdm import tqdm
 
 from completor import create_output, parse, read_schedule, utils
@@ -27,8 +26,6 @@ from completor.utils import (
 )
 from completor.wells import Well
 
-pd.set_option("future.no_silent_downcasting", True)
-
 
 def get_content_and_path(case_content: str, file_path: str | None, keyword: str) -> tuple[str | None, str | None]:
     """Get the contents of a file from a path defined by user or case file.
@@ -92,7 +89,6 @@ def create(
     """
     case = ReadCasefile(case_file=case_file, schedule_file=schedule, output_file=new_file)
     active_wells = utils.get_active_wells(case.completion_table, case.gp_perf_devicelayer)
-
     figure_name = None
     if show_fig:
         figure_no = 1
@@ -126,11 +122,13 @@ def create(
         for chunk in find_keyword_data(Keywords.COMPLETION_SEGMENTS, schedule):
             clean_data = clean_raw_data(chunk, Keywords.COMPLETION_SEGMENTS)
             meaningful_data = read_schedule.set_compsegs(meaningful_data, clean_data)
-
         for i, well_name in tqdm(enumerate(active_wells.tolist()), total=len(active_wells)):
-            well = Well(well_name, i, case, meaningful_data[well_name])
+            try:
+                well = Well(well_name, i, case, meaningful_data[well_name])
+            except KeyError:
+                logger.warning(f"Well '{well_name}' is written in case file but does not exist in schedule file.")
+                continue
             compdat, welsegs, compsegs, bonus = create_output.format_output(well, case, figure_name)
-
             for keyword in [Keywords.COMPLETION_SEGMENTS, Keywords.WELL_SEGMENTS, Keywords.COMPLETION_DATA]:
                 old_data = find_well_keyword_data(well_name, keyword, schedule)
                 if not old_data:

completor/utils.py

@@ -338,7 +338,7 @@ def find_well_keyword_data(well: str, keyword: str, text: str) -> str:
                 if once:
                     lines.append(line)
                 continue
-            if well in line.split()[0]:
+            if well == line.split()[0].replace("'", "").replace('"', ""):
                 if keyword in [Keywords.WELL_SEGMENTS, Keywords.COMPLETION_SEGMENTS]:
                     # These keywords should just be the entire match as they never contain more than one well.
                     return match

{completor-1.0.1.dist-info → completor-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: completor
-Version: 1.0.1
+Version: 1.1.1
 Summary: Advanced mulit-segmented well completion tool.
 Home-page: https://github.com/equinor/completor
 License: LGPL-3.0-only
@@ -14,15 +14,15 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Provides-Extra: ert
 Requires-Dist: docutils (==0.20.1) ; extra == "ert"
-Requires-Dist: ert (>=11.1.0,<12.0.0) ; extra == "ert"
-Requires-Dist: matplotlib (>=3.9.2,<4.0.0)
-Requires-Dist: numpy (<2.0.0)
-Requires-Dist: pandas (>=2.2.3,<3.0.0)
+Requires-Dist: ert (>11.1.0) ; extra == "ert"
+Requires-Dist: matplotlib (>=3.6,<4.0)
+Requires-Dist: numpy (<2)
+Requires-Dist: pandas (>=2.1.4,<3.0.0)
 Requires-Dist: pyqt5-qt5 (==5.15.2) ; extra == "ert"
-Requires-Dist: pytest-env (>=1.1.4,<2.0.0)
+Requires-Dist: pytest-env (>=1,<2)
 Requires-Dist: rstcheck-core (>=1.2.1,<2.0.0) ; extra == "ert"
-Requires-Dist: scipy (>=1.14.1,<2.0.0)
-Requires-Dist: tqdm (>=4.66.5,<5.0.0)
+Requires-Dist: scipy (>=1.10,<2.0)
+Requires-Dist: tqdm (>=4.50,<5.0)
 Project-URL: Bug Tracker, https://github.com/equinor/completor/issues
 Project-URL: Documentation, https://equinor.github.io/completor
 Project-URL: Repository, https://github.com/equinor/completor

{completor-1.0.1.dist-info → completor-1.1.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ completor/__init__.py,sha256=k6amf7jhp7KkBIlaw93-NZITxyZjPSzA5McFAZh8yv8,76
 completor/completion.py,sha256=COtRZpEdmuf3X_uOvEYYLz428nQSn1Z8QH-7TTREyus,30485
 completor/config_jobs/run_completor,sha256=XePKj2xocfGF0XFRqr7sqfpZGrjgWcfaZLHIhVvGFCQ,600
 completor/constants.py,sha256=Th7fzID5NPUhyV2RRc5h9qRQ963cKGT3TVCX_bsAtHA,12802
-completor/create_output.py,sha256=8DGrrUKHLMUz3k9hrcEMnyAWzKR04KrT4HkAR3tVZKA,23191
+completor/create_output.py,sha256=3IIndoE0aE1ZTKVnjMLi56mJLVbgrYTWkEJs4XkqZDU,23028
 completor/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 completor/exceptions/clean_exceptions.py,sha256=uQ2jgGfvUDAoS56JBWh-8ZCPIMB4hvYxLF-snA-_-pg,373
 completor/exceptions/exceptions.py,sha256=eS00mVzmC4gQ7MUyGSknvKotmo2XzNGyp007mhjLMy0,5081
@@ -11,17 +11,17 @@ completor/hook_implementations/jobs.py,sha256=8Ao8UadfJzEY7jWzj6C_OXm18fHmfXrbCB
 completor/input_validation.py,sha256=OGY5oCdctlqzeg5Z2l4cmRb3ITtSjLp1Ufp0Joj7aKA,13495
 completor/launch_args_parser.py,sha256=gb3FcyufZlRnKS3BZkFmgVH1VoSxMD0MbCLsHZKmz4c,1413
 completor/logger.py,sha256=gYDbPL8ca5qT_MqYlDKEMKcSfIXW_59QklX8Gss5b2U,4784
-completor/main.py,sha256=_McIv2fSVROBV1JarPLxoOX9OA6ILIh72zwqedHwosQ,9037
+completor/main.py,sha256=ipARMDXXqPYRtBxYQnlj5MohepwkgrQkX3s2IJEaEcI,9151
 completor/parse.py,sha256=EGlt9CgkrXPqa7woyWQ5t_nh6OWsFrc2SJr8aFr_KsQ,20133
 completor/prepare_outputs.py,sha256=fenEo3UfDzXF4jaxi9vDI-g-BkYSti0LxILJf7lO84A,72081
 completor/read_casefile.py,sha256=ZJj-xrpcTeagJmqqi72UIOIcq9uQJaEZClbCA1lW4yw,34081
 completor/read_schedule.py,sha256=IYyCubOggFGg664h1flTl7MUJhJWyibr6JsptnURjUA,18101
-completor/utils.py,sha256=6dvclzQ6yAvnqal6bzlE7C1iKWiT-sGjFCCu2tuMdG4,13542
+completor/utils.py,sha256=JFzTvt4wLZm-VUoamneQgUBVfdoPJmNAlgdQ80qOL5Y,13576
 completor/visualization.py,sha256=ObxThqIyW3fsvVIupxVsgySFI_54n_Di-HTzFtDMSgo,4580
 completor/visualize_well.py,sha256=I2kp2rnM2eFV4RUWnTTysPTqQKNEBicF2S9Z3rrAsNA,8672
 completor/wells.py,sha256=oj3e65tSIDFJEpfOKkr_j4H3RyFKpdjZBAcef7sUoaY,12124
-completor-1.0.1.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-completor-1.0.1.dist-info/METADATA,sha256=z4bPc8-m3xisqxBAAkvD30zuLRZCTDo1pDBk8sTSIrQ,7913
-completor-1.0.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-completor-1.0.1.dist-info/entry_points.txt,sha256=co5L2_CC2QQWVdEALeMp-NIC4mx4nRpcLcvpVXMYdeI,106
-completor-1.0.1.dist-info/RECORD,,
+completor-1.1.1.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+completor-1.1.1.dist-info/METADATA,sha256=TIfdCVY0R8QPFW2nNseFcfgflD7GVu-vNKwP8VcRU_c,7880
+completor-1.1.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+completor-1.1.1.dist-info/entry_points.txt,sha256=co5L2_CC2QQWVdEALeMp-NIC4mx4nRpcLcvpVXMYdeI,106
+completor-1.1.1.dist-info/RECORD,,