schain Commit - r929:136584fbb1e2 · Jicamarca Repository

checking misspelled kwargs in operations/processing units

José Chávez -

r929:136584fbb1e2

parent child

Context file:

r929:136584fbb1e2

Collapse all files

schainpy/model/graphics/jroplot_parameters.py +3 -4

             import os
             import datetime
             import numpy
+            import inspect
             from figure import Figure, isRealtime, isTimeInHourRange
             from plotting_codes import *
                         save=False, figpath='./', lastone=0,figfile=None, ftp=False, wr_period=1, show=True,
                         server=None, folder=None, username=None, password=None,
                         ftp_wei=0, exp_code=0, sub_exp_code=0, plot_pos=0):
                     """
                     Input:
                     self.__nsubplots = 1
                     self.WIDTH = 800
-                    self.HEIGHT = 150
+                    self.HEIGHT = 180
                     self.WIDTHPROF = 120
                     self.HEIGHTPROF = 0
                     self.counter_imagwr = 0
                         save=False, figpath='./', lastone=0,figfile=None, ftp=False, wr_period=1, show=True,
                         server=None, folder=None, username=None, password=None,
                         ftp_wei=0, exp_code=0, sub_exp_code=0, plot_pos=0):
+                    #print inspect.getargspec(self.run).args
                     """
                     Input:

schainpy/model/proc/jroproc_base.py +41 -9

             $Author: murco $
             $Id: jroproc_base.py 1 2012-11-12 18:56:07Z murco $
             '''
+            import inspect
+            from fuzzywuzzy import process
+            def checkKwargs(method, kwargs):
+                currentKwargs = kwargs
+                choices = inspect.getargspec(method).args
+                try:
+                    choices.remove('self')
+                except Exception as e:
+                    pass
+                try:
+                    choices.remove('dataOut')
+                except Exception as e:
+                    pass
+                for kwarg in kwargs:
+                    fuzz = process.extractOne(kwarg, choices)
+                    print fuzz
+                    if fuzz is None:
+                        continue
+                    if fuzz[1] < 100:
+                        raise Exception('\x1b[2;30;43mDid you mean {} instead of {} in {}? \x1b[0m'.
+                                        format(fuzz[0], kwarg, method.__self__.__class__.__name__))
             class ProcessingUnit(object):
                     self.args = args
                     self.kwargs = kwargs
+                    checkKwargs(self.run, kwargs)
+                def getAllowedArgs(self):
+                    return inspect.getargspec(self.run).args
                 def addOperationKwargs(self, objId, **kwargs):
                     '''
                     '''
                     self.operationKwargs[objId] = kwargs
                 def addOperation(self, opObj, objId):
                     """
                     #Executing the self method
                     if hasattr(self, 'mp'):
                         if name=='run':
                             if self.mp is False:
                                 self.mp = True
                                 self.start()
                         else:
                             methodToCall(**self.operationKwargs[opId])
                     else:
                         if name=='run':
                             methodToCall(**self.kwargs)
                         else:
                             methodToCall(**self.operationKwargs[opId])
                     if self.dataOut is None:
                     self.__buffer = None
                     self.isConfig = False
                     self.kwargs = kwargs
+                    checkKwargs(self.run, kwargs)
+                def getAllowedArgs(self):
+                    return inspect.getargspec(self.run).args
                 def setup(self):

schainpy/scripts/PPD.py +17 -8

                 controllerObj.setup(id='191', name='test01', description=desc)
                 readUnitConfObj = controllerObj.addReadUnit(datatype='SpectraReader',
-                                                             path='/home/nanosat/data/hysell_data20/pdata',
+                                                             path='/home/nanosat/data/julia',
                                                              startDate=dt,
                                                              endDate=dt,
                                                              startTime="00:00:00",
-                                                             endTime="23:59:59",
+                                                             endTie="23:59:59",
                                                              online=0,
                                                              #set=1426485881,
                                                              delay=10,
                 #     #opObj11 = readUnitConfObj.addOperation(name='printNumberOfBlock')
                 #
                 procUnitConfObj2 = controllerObj.addProcUnit(datatype='Spectra', inputId=readUnitConfObj.getId())
-                # opObj11 = procUnitConfObj2.addParameter(name='pairsList', value='(0,1)', format='pairslist')
+                # procUnitConfObj2.addParameter(name='nipp', value='5', format='int')
                 procUnitConfObj3 = controllerObj.addProcUnit(datatype='ParametersProc', inputId=readUnitConfObj.getId())
                 opObj11 = procUnitConfObj3.addOperation(name='SpectralMoments', optype='other')
                 #     opObj11.addParameter(name='save', value='1', format='int')
                 #     opObj11.addParameter(name='figpath', value=figpath, format='str')
-                # opObj11 = procUnitConfObj2.addOperation(name='RTIPlot', optype='other')
+                opObj11 = procUnitConfObj3.addOperation(name='Parameters1Plot', optype='other')
-                # opObj11.addParameter(name='id', value='2000', format='int')
+                opObj11.addParameter(name='channelList', value='0', format='intList')
-                # opObj11.addParameter(name='wintitzmaxle', value='HF_Jicamarca', format='str')
-                # opObj11.addParameter(name='showprofile', value='0', format='int')
+                opObj11.addParameter(name='id', value='2000', format='int')
+                # opObj11.addParameter(name='colormap', value='0', format='bool')
+                opObj11.addParameter(name='onlySNR', value='1', format='bool')
+                opObj11.addParameter(name='DOP', value='0', format='bool')
+                # opObj11.addParameter(name='showSNR', value='1', format='bool')
+                # opObj11.addParameter(name='SNRthresh', value='0', format='int')
+                # opObj11.addParameter(name='SNRmin', value='-10', format='int')
+                # opObj11.addParameter(name='SNRmax', value='30', format='int')
+                # opObj11.addParameter(name='showSNR', value='1', format='int')
                 # # opObj11.addParameter(name='channelList', value='0', format='intlist')
                 # #     opObj11.addParameter(name='xmin', value='0', format='float')
                 # opObj11.addParameter(name='xmin', value='0', format='float')

schainpy/scripts/schain.xml +1 -1

	@@ -1,1 +1,1
	1	<Project description="HF_EXAMPLE" id="191" name="test01"><ReadUnit datatype="SpectraReader" id="1911" inputId="0" name="SpectraReader"><Operation id="19111" name="run" priority="1" type="self"><Parameter format="str" id="191111" name="datatype" value="SpectraReader" /><Parameter format="str" id="191112" name="path" value="/home/nanosat/data/~~hysell_data20/pdat~~a" /><Parameter format="date" id="191113" name="startDate" value="2015/09/26" /><Parameter format="date" id="191114" name="endDate" value="2015/09/26" /><Parameter format="time" id="191115" name="startTime" value="00:00:00" /><Parameter format="time" id="191116" name="endTime" value="23:59:59" /><Parameter format="int" id="191118" name="cursor" value="2" /><Parameter format="int" id="191119" name="skip" value="720" /><Parameter format="int" id="191120" name="delay" value="10" /><Parameter format="int" id="191121" name="walk" value="1" /><Parameter format="int" id="191122" name="online" value="0" /></Operation></ReadUnit><ProcUnit datatype="ParametersProc" id="1913" inputId="1911" name="ParametersProc"><Operation id="19131" name="run" priority="1" type="self" /><Operation id="19132" name="SpectralMoments" priority="2" type="other" /><Operation id="19133" name="PublishData" priority="3" type="other"><Parameter format="int" id="191331" name="zeromq" value="1" /><Parameter format="int" id="191332" name="delay" value="1" /></Operation></ProcUnit><ProcUnit datatype="Spectra" id="1912" inputId="1911" name="SpectraProc"><Operation id="19121" name="run" priority="1" type="self" /></ProcUnit></Project> No newline at end of file		1	<Project description="HF_EXAMPLE" id="191" name="test01"><ReadUnit datatype="SpectraReader" id="1911" inputId="0" name="SpectraReader"><Operation id="19111" name="run" priority="1" type="self"><Parameter format="str" id="191111" name="datatype" value="SpectraReader" /><Parameter format="str" id="191112" name="path" value="/home/nanosat/data/julia" /><Parameter format="date" id="191113" name="startDate" value="2015/09/26" /><Parameter format="date" id="191114" name="endDate" value="2015/09/26" /><Parameter format="time" id="191115" name="startTime" value="00:00:00" /><Parameter format="time" id="191116" name="endTime" value="23:59:59" /><Parameter format="int" id="191118" name="cursor" value="0" /><Parameter format="int" id="191119" name="skip" value="0" /><Parameter format="int" id="191120" name="delay" value="10" /><Parameter format="int" id="191121" name="walk" value="1" /><Parameter format="int" id="191122" name="online" value="0" /></Operation></ReadUnit><ProcUnit datatype="ParametersProc" id="1913" inputId="1911" name="ParametersProc"><Operation id="19131" name="run" priority="1" type="self" /><Operation id="19132" name="SpectralMoments" priority="2" type="other" /><Operation id="19133" name="Parameters1Plot" priority="3" type="other"><Parameter format="intlist" id="191331" name="channelList" value="0" /><Parameter format="int" id="191332" name="id" value="2000" /><Parameter format="bool" id="191333" name="olySNR" value="1" /><Parameter format="bool" id="191334" name="DOP" value="0" /></Operation><Operation id="19134" name="PublishData" priority="4" type="other"><Parameter format="int" id="191341" name="zeromq" value="1" /><Parameter format="int" id="191342" name="delay" value="1" /></Operation></ProcUnit><ProcUnit datatype="Spectra" id="1912" inputId="1911" name="SpectraProc"><Operation id="19121" name="run" priority="1" type="self" /></ProcUnit></Project> No newline at end of file

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages