Add some missing type annotations

Author: r-barnes

programs/parallel_d8_accum/test_big.py

@@ -19,7 +19,7 @@
 
 VERBOSE = False
 
-def doRaw(cmd):
+def doRaw(cmd: str):
   if VERBOSE:
     print('      '+cmd)
   p      = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
@@ -31,7 +31,7 @@ def doRaw(cmd):
     print('')
   return output, err
 
-def FileInfo(filename):
+def FileInfo(filename: str):
   """Returns the NoData value and data type of the specified file"""
   src_ds  = gdal.Open( filename )
   srcband = src_ds.GetRasterBand(1)
@@ -45,7 +45,7 @@ def FillAndTest(
   n,
   many_or_one,
   strat,
-  inpfile,
+  inpfile: str,
   width  = -1,
   height = -1
 ):
@@ -118,7 +118,7 @@ def FillAndTest(
     print("Expected: '{0}'".format('Computed Min/Max=0.000,0.000'))
 
 
-def is_valid_file(parser, arg):
+def is_valid_file(parser: argparse.ArgumentParser, arg: str) -> str:
   if not os.path.exists(arg):
     parser.error("Input file '{0}' does not exist!".format(arg))
   else:
@@ -145,7 +145,7 @@ def main():
   if not os.path.exists('../../apps/rd_flow_accumulation.exe'):
     print("The RichDEM flow accumulation app is missing!")
     sys.exit(-1)
-    
+
 
   print('Ensuring directory "temp" exists')
   if not os.path.exists('temp'):

programs/parallel_priority_flood/test.py

@@ -15,11 +15,12 @@
 import time
 import argparse
 import multiprocessing
+from typing import List, Tuple
 from osgeo import gdal
 
 VERBOSE = False
 
-def doRaw(cmd):
+def doRaw(cmd: str) -> Tuple[List[str], int]:
   if VERBOSE:
     print('      '+cmd)
   p      = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
@@ -31,7 +32,7 @@ def doRaw(cmd):
     print('')
   return output, err
 
-def FileInfo(filename):
+def FileInfo(filename: str):
   """Returns the NoData value and data type of the specified file"""
   src_ds  = gdal.Open( filename )
   srcband = src_ds.GetRasterBand(1)
@@ -45,7 +46,7 @@ def FillAndTest(
   n,
   many_or_one,
   strat,
-  inpfile,
+  inpfile: str,
   width  = -1,
   height = -1
 ):
@@ -117,7 +118,7 @@ def FillAndTest(
     print("Expected: '{0}'".format('Computed Min/Max=0.000,0.000'))
 
 
-def is_valid_file(parser, arg):
+def is_valid_file(parser: argparse.ArgumentParser, arg: str) -> str:
   if not os.path.exists(arg):
     parser.error("Input file '{0}' does not exist!".format(arg))
   else:
@@ -144,7 +145,7 @@ def main():
   if not os.path.exists('auth_gen.exe'):
     print("You need to run 'make auth_gen' before you can test things.")
     sys.exit(-1)
-    
+
 
   print('Ensuring directory "temp" exists')
   if not os.path.exists('temp'):

wrappers/pyrichdem/richdem/__init__.py

@@ -1,10 +1,9 @@
 import copy
 import datetime
 import pkg_resources
-from typing import Any, Final, List, Iterable, Optional, Tuple, Union
+from typing import Any, Dict, Final, List, Iterable, Optional, Tuple, Union
 
 import numpy as np
-import sys
 
 try:
     import _richdem
@@ -115,6 +114,10 @@ def rdShow(
     ax.set_ylim(ymin=ymin, ymax=ymax)
 
     if all_zoom:
+        assert zxmin is not None
+        assert zxmax is not None
+        assert zymin is not None
+        assert zymax is not None
         axins = inset_axes(
             ax, width=2, height=2, loc=zloc, borderpad=0
         )  # , bbox_to_anchor=(0.9, -0.05, 1, 1), bbox_transform=ax.transAxes, borderpad=0)
@@ -529,7 +532,7 @@ def FlowAccumulation(dem: rdarray, method: Optional[str] = None, exponent: Optio
     if type(dem) is not rdarray:
         raise Exception("A richdem.rdarray or numpy.ndarray is required!")
 
-    facc_methods = {
+    facc_methods: Dict[str, Any] = {
         "Tarboton": _richdem.FA_Tarboton,
         "Dinf": _richdem.FA_Tarboton,
         "Quinn": _richdem.FA_Quinn,
@@ -543,7 +546,7 @@ def FlowAccumulation(dem: rdarray, method: Optional[str] = None, exponent: Optio
         "D4": _richdem.FA_D4,
     }
 
-    facc_methods_exponent = {
+    facc_methods_exponent: Dict[str, Any] = {
         "Freeman": _richdem.FA_Freeman,
         "Holmgren": _richdem.FA_Holmgren,
     }
@@ -579,7 +582,7 @@ def FlowAccumulation(dem: rdarray, method: Optional[str] = None, exponent: Optio
     elif method in facc_methods_exponent:
         if exponent is None:
             raise Exception(
-                'FlowAccumulation method "' + method + '" requires an exponent!'
+                f'FlowAccumulation method "{method}" requires an exponent!'
             )
         facc_methods_exponent[method](dem.wrap(), accumw, exponent)
     else:

wrappers/pyrichdem/richdem/cli.py

@@ -7,7 +7,7 @@
 import numpy as np
 
 
-def DepressionFilling():
+def DepressionFilling() -> None:
     parser = argparse.ArgumentParser(
         formatter_class=RawTextHelpFormatter, description="RichDEM Depression Filling"
     )
@@ -31,7 +31,7 @@ def DepressionFilling():
     rd.SaveGDAL(args.outname, dem)
 
 
-def BreachDepressions():
+def BreachDepressions() -> None:
     parser = argparse.ArgumentParser(
         formatter_class=RawTextHelpFormatter,
         description="""RichDEM Depression Breaching""",
@@ -50,7 +50,7 @@ def BreachDepressions():
     rd.SaveGDAL(args.outname, dem)
 
 
-def FlowAccumulation():
+def FlowAccumulation() -> None:
     parser = argparse.ArgumentParser(
         formatter_class=RawTextHelpFormatter,
         description="""RichDEM Flow Accumulation
@@ -94,7 +94,7 @@ def FlowAccumulation():
     rd.SaveGDAL(args.outname, accum)
 
 
-def TerrainAttribute():
+def TerrainAttribute() -> None:
     parser = argparse.ArgumentParser(
         formatter_class=RawTextHelpFormatter,
         description="""RichDEM Terrain Attribute
@@ -140,7 +140,7 @@ def TerrainAttribute():
     rd.SaveGDAL(args.outname, tattrib)
 
 
-def RdInfo():
+def RdInfo() -> None:
     parser = argparse.ArgumentParser(
         formatter_class=RawTextHelpFormatter,
         description="""RichDEM Dataset Information
@@ -190,7 +190,7 @@ def RdInfo():
         rd.rdShow(rda, cmap=args.cmap, vmin=args.vmin, vmax=args.vmax)
 
 
-def RdCompare():
+def RdCompare() -> None:
     parser = argparse.ArgumentParser(
         formatter_class=RawTextHelpFormatter,
         description="""RichDEM Dataset Comparison
@@ -216,10 +216,10 @@ def RdCompare():
         print("Projection differs")
 
     if np.any(np.isnan(ds1)):
-        print("NaN in '{0}'".format(filename))
+        print("NaN in '{0}'".format(args.rda1))
 
     if np.any(np.isnan(ds2)):
-        print("NaN in '{0}'".format(filename))
+        print("NaN in '{0}'".format(args.rda2))
 
     diff = np.array(ds1 - ds2)