f618515fc2
Fix Logging BUG with WEB dump
4 years ago
150300de34
FIX MEGA BUG - DONT USE DEFAUL VALUE AS [] or {} - python has been save it between call if arg is not transmitted
4 years ago
f72b20a490
Fix in BC with User URL match list
4 years ago
8487d6e485
Minor fix BC Old Start (DeepMergeDict2to1 FIXES)
4 years ago
f9c2349d67
Minor fix BC Old Start (BC FIXES)
4 years ago
c2643a0c19
Minor fix BC Old Start (BC FIXES)
4 years ago
2a1838f36f
Minor fix BC Old Start
4 years ago
0237db208f
Minor fix BC Old Start
4 years ago
e4a264617b
Minor fix BC Old Start
4 years ago
f733935a4a
Minor fix BC Old Start
4 years ago
242a466944
Minor fix when test after rename
4 years ago
fcb839d97c
Renamin main file to __main file__ because of collisions when import
4 years ago
09ba3c0e86
! Scheduler period activity was suppressed ("TimeHH:MMStart" in lItem and "TimeHH:MMStop")
...
- WEB Connect defs
- def WebURLConnectDef(inGSettings, inMethodStr, inURLStr, inMatchTypeStr, inDef, inContentTypeStr="application/octet-stream"): # Connect URL to DEF
- def WebURLConnectFolder(inGSettings, inMethodStr, inURLStr, inMatchTypeStr, inFolderPathStr): # Connect URL to Folder
- def WebURLConnectFile(inGSettings, inMethodStr, inURLStr, inMatchTypeStr, inFilePathStr, inContentTypeStr="application/octet-stream"): # Connect URL to File
- def RDPTemplateCreate(inLoginStr, inPasswordStr, inHostStr="127.0.0.1", inPortInt = 3389, inWidthPXInt = 1680, inHeightPXInt = 1050, inUseBothMonitorBool = False, inDepthBitInt = 32, inSharedDriveList=["c"]): # Create some RDP template dict to use it when connect/reconnect
- Update def RDPSessionConnect(inGSettings, inRDPSessionKeyStr, inRDPTemplateDict=None, inHostStr=None, inPortStr=None, inLoginStr=None, inPasswordStr=None): # Create new RDPSession in RobotRDPActive. Attention - activity will be ignored if key is exists
- Update def RDPSessionReconnect(inGSettings, inRDPSessionKeyStr, inRDPTemplateDict=None): # RDP Session reconnect
4 years ago
f1f706bca1
- def UACKeyListCheck(inRequest, inRoleKeyList): #Check is client is has access for the key list
...
- def WebUserInfoGet(inRequest): # Return User info about request Return {"DomainUpperStr":"", "UserNameUpperStr": ""}
- def WebUserUACHierarchyGet(inRequest): # Return User UAC Hierarchy DICT Return {...}
- Scheduler
- Refactoring in gSettings (Scheduler > SchedulerDict)
- def SchedulerActivityTimeAddWeekly(inGSettings, inTimeHHMMStr="23:55:", inWeekdayList=[], inActivityList=[]): # Add activity in time weekly
- Scheduler now listen SchedulerDict
- def ProcessorActivityItemAppend(inGSettings, inDef, inArgList=[], inArgDict={}, inArgGSettingsStr=None, inArgLoggerStr=None): # Add Activity item in Processor list
4 years ago
09ae47ac85
- Add Working Dir (CWD) + Orchestrator Version Str in ServerData > UserDict
...
- Orc Web JS - lite refactoring
4 years ago
caf688536a
- Orc new structure for CP: "CPDict": { # "CPKey": {"HTMLRenderDef":None, "JSONGeneratorDef":None, "JSInitGeneratorDef":None}},
...
- - Back: inGSettings["CPDict"][RobotKeyStr]["HTMLRenderDef"] > Front: mGlobal.pyOpenRPA.ServerDataDict.CPDict.RobotKeyStr.HTMLStr
- - Back: inGSettings["CPDict"][RobotKeyStr]["JSONGeneratorDef"] > Front: mGlobal.pyOpenRPA.ServerDataDict.CPDict.RobotKeyStr.JSONDict
- - CPDict > HTMLRenderDef > def (inGSettings); def (inRequest, inGSettings); def ()
- - CPDict > JSONGeneratorDef > def (inGSettings); def (inRequest, inGSettings); def ()
- - CPDict > JSInitGeneratorDef > def (inGSettings); def (inRequest, inGSettings); def ()
Orc connect JSONGenerators to WEB Front (mGlobal.)
- Orc back: add new block: OrchestratorWeb
- - def OrchestratorWebCPUpdate(inGSettings, inCPKeyStr, inHTMLRenderDef=None, inJSONGeneratorDef=None, inJSInitGeneratorDef=None): # Add control panel HTML, JSON generator or JS when page init
4 years ago
4c31b27bf6
- Orc RoleHierarchy - support RDP, Support Agent + buttons
...
Tested!
4 years ago
2e73292fc6
- Orc - add log about send activity to agent
4 years ago
2fc1553c9f
- Agent Add 2 defs:
...
- - def OSFileTextDataStrCreate(inFilePathStr, inFileDataStr, inEncodingStr = "utf-8",inGSettings = None): # Create text file by the string
- - def OSFileBinaryDataBase64StrCreate(inFilePathStr, inFileDataBase64Str,inGSettings = None): # Create binary file by the base64 string (safe for JSON transmition)
-Orc Defs
- - def AgentOSFileBinaryDataBytesCreate(inGSettings, inHostNameStr, inUserStr, inFilePathStr, inFileDataBytes): # Send binary file to Agent (Bytes)
- - def AgentOSFileBinaryDataBase64StrCreate(inGSettings, inHostNameStr, inUserStr, inFilePathStr, inFileDataBase64Str): # Send binary file to Agent (base64 string)
- - def AgentOSFileTextDataStrCreate(inGSettings, inHostNameStr, inUserStr, inFilePathStr, inFileDataStr, inEncodingStr = "utf-8"): # Send text file to Agent (string)
4 years ago
913505ae0e
- - def AgentOSFileDataBytesCreate(inGSettings, inHostNameStr, inUserStr, inFilePathStr, inFileDataBytes): # Send to agent activity item to OSCMD
...
- - def AgentOSFileDataStrCreate(inGSettings, inHostNameStr, inUserStr, inFilePathStr, inFileDataStr, inEncodingStr="utf-8"): # Send to agent activity item to OSCMD
Need to test Agent.FileCreate - has ploblem with transmit bytes on JSON - json dont support bytes string... Need safe encode/decode
4 years ago
2f40c81a72
- Agent: Add Agent defs as Alias in ProcessorDict
...
- Agent Add 2 defs:
- - def OSFileBytesCreate(inFilePathStr, inFileBytes,inGSettings = None): # Send CMD to OS. Result return to log + Orchestrator by the A2O connection
- - def OSCMD(inCMDStr, inRunAsyncBool=True, inGSettings = None): # Send CMD to OS. Result return to log + Orchestrator by the A2O connection
- Orc: Add Agent Defs
- - def AgentActivityItemAdd(inGSettings, inHostNameStr, inUserStr, inActivityItemDict): # Add activity in AgentDict
- - def AgentOSCMD(inGSettings, inHostNameStr, inUserStr, inCMDStr): # Send to agent activity item to OSCMD
- - def AgentOSFileBytesCreate(inGSettings, inHostNameStr, inUserStr, inFilePathStr, inFileBytes): # Send to agent activity item to OSCMD
- Orc WEB: Create mGlobal.pyOpenRPA.ActivityListExecute({}) to test some activities from the front
4 years ago
cbc4b42180
- Orch web: Fix eror in serverDataRender when error render
...
- Agent: Add CMD to kill agent because it is in background mode
- Orch: Add handler to set connection when Agent listen orch (/pyOpenRPA/Agent/O2A)
- Orch start processor Dict in own thread (Processor.ProcessorRunSync(inGSettings))
- Agent: Create Processor in Agent similarly to Orchestrator (pyOpenRPA.Agent.Processor == pyOpenRPA.Orchestrator.Processor)
4 years ago
383fc9b575
- Orch: /pyOpenRPA/ServerData - add sub dict "AgentDict"
...
- Orch WEB: Create Agent render
!NEED TEST!
4 years ago
fc4a0b1f50
Add AgentDict in settings = Backward compatibility
4 years ago
16bdd675b8
Some fixes after test
4 years ago
7a6e961aa8
- Create pyOpenRPA.Agent - just prototype, need test
...
- Create Agent support in Orchestrator (/pyOpenRPA/Agent/O2A and /pyOpenRPA/Agent/A2O)
Just writed prototype - start to test
4 years ago
caeae7c997
- Create new pyOpenRPA UAC Client hierarchy SettingsTemplate.__UACClientAdminCreate__ - need to update functionallity
...
- Orchestrator WEB: Update WEB to the new UACClient
4 years ago
fea3809d85
- Create /pyOpenRPA/ActivityListExecute
...
- Create /pyOpenRPA/Processor
- Orchestrator.OSCMD Listen output and send to logger
- Orchestrator.OSCMD Add 2 input args inLogger + inRunAsyncBool
- WEB Update CMD Input line (tranfer to Log view). Change /Utils/Processor to /pyOpenRPA/ActivityListExecute
- Defs has been added in ProcessorAliasDict as Alias with own def name
- WEB Remove client freeze when back is dead
4 years ago
1adf4b5683
# Create log viewer in the front of the web
4 years ago
bde44722e9
# Add new Handler for the log dump - need to refactoring...!!!!
4 years ago
2942b7cc70
- Orchestrator WEB GUI update - Administrator mode - add log view - in progress
4 years ago
a2eab2389a
- Test URL "/pyOpenRPA/ServerData"
...
- Create new support - CP def can return {"CPKeyStr":{"HTMLStr":"", DataDict:{}}}
- Create CP 2 HTML generator for the backward compatibility
4 years ago
2a36bc8e70
# Add "/pyOpenRPA/ServerData" - in progress
4 years ago
c79c446888
# Add "/pyOpenRPA/ServerData" - in progress
4 years ago
026a152dfc
+- Create Web HTML / JS generators [pyOpenRPA.Orchestrator.Web.Basic]
...
+- - def JSEscapeForHTMLInline(inJSStr): # Escape JS to the safe JS for the inline JS in HTML tags ATTENTION! Use it only if want to paste JS into HTML tag - not in <script>
+- - def HTMLLinkURL(inURLStr, inTitleStr=None, inColorStr=None): # Generate HTML code of the simple URL link by the URL
+- - def HTMLLinkJSOnClick(inJSOnClickStr, inTitleStr, inColorStr=None): # Generate HTML code of the simple URL link by the JS when onclick
4 years ago
a0e85bb795
dev in progress - need update for GUID -do not create it
...
+- Add absolute/relative import for the control panels
+- Add new Orchestrator defs:
+- - def OrchestratorAccessUserUpdate(inGSettings, inADLoginStr, inADStr="", inADIsDefaultBool=True, inURLList=[], inCPAllowKeyList=[]): - Update user access
+- - def OrchestratorAccessSuperTokenAdd(inGSettings, inSuperTokenStr): # Add supertoken for the all access (it is need for the robot communication without human)
4 years ago
921f8f72a2
# Add version check + autorefresh if version was changed (with backward compatibility)
4 years ago
178ba3398d
# Add minor fix in RDP defs - Need test
4 years ago
bee96d3596
# Create Orchestrator.RDP defs - need decorator @ProcessorOnly
4 years ago
090754443f
# Updated all old defs in new Orchestrator.<def name>
4 years ago
f371cc6b8a
# Start test with new SettingsTemplate (new file is out of the repo. It will be included later after test)
4 years ago
239a2c6c83
# Test new processor in progress - need new setings template
4 years ago
9a7fc13d9f
# in progress new orchestrator processor
4 years ago
bbe555857f
# Bug fix in RDPProcessor
4 years ago
03d81095a1
#Feature multiple process in one RDP
4 years ago
b7f88de8bf
# Support multiple processes in 1 RDP session
4 years ago
540f765a79
# Release new version v1.1.18 + added in pip
4 years ago
e1bd95c4cc
# Fix in CMDRun for some OS # Fix in async set in clipboard # Fix double ctrl a for some os cmd (wrong actions)
4 years ago
cd038a0879
# upgrade py openRPA to 1.1.17
4 years ago
44d0f16981
# minor fixes after test
4 years ago
f421aaa2ea
# Add orchestrator/Server unquotes for URL path (need for rus symbols in fila path)
4 years ago
5516c82c90
# minor fix in SessionHex if no RDP session (time lag with WEB GUI)
4 years ago
c7cfa66a62
# minor fixes in basic UAC (because of add 2 buttons in front)
4 years ago
c5de069966
# Release 1.1.14 to pypi.org (pip install pyOpenRPA==1.1.14)
4 years ago
a1fb5ae762
# Minor fix in RDP restore operations
4 years ago
c369c70b80
# Add struct to load SettingsUpdate after RDP restore
4 years ago
3b528c3c67
# Minor fixes in render RDPList 3
4 years ago
d7dbb8c2f0
# Minor fixes in render RDPList 2
4 years ago
1791f35b31
# Minor fixes in render RDPList
4 years ago
a49112e25f
# Add log when RDP restore # minor test passed +
4 years ago
e2c1d3e575
# Test + Add web button + add model in front + Backward compatibility from v1.1.13 + try..except when load CP
4 years ago
5333209528
# Orch ajax optimized # Remove refresh button # remove RDPListControlPanelGet # AddAutocleaner #Add exception if ControlPanel with error # Restart Orch with old RDP List!!! (need test)
4 years ago
7bc9acf2a5
# In progress save RDPList from old session
4 years ago
7df0f46c16
# Minor fixes
5 years ago
233bbff76b
# Add Index.js
5 years ago
73e563e58f
# Lite style update in orchestrator
5 years ago
e765aad800
# Minor fix in Studio Web Header
5 years ago
fe19b15805
# Lite rebranding - add new logo in web + favico.ico
5 years ago
b578600c09
# Upgrade pywinauto to 0.6.8 (Fixed some big bug with int convert to long fails) + Some Docs fixes in Pypi
5 years ago
1640a8f317
# Minor fixes in UAC User-Role models (back + front tested)
5 years ago
cb1610eb97
# v1.1.11 Add args inRequest + inGlobalDict in control panel + backward compatibility (control panel with 1 arg is working)
5 years ago
0044fd9263
# Minor fix in pyOpenRPA with logging (dont log processor activity from supertokens)
5 years ago
16ee75123b
# Revert the changes in UIDesktop - not tested. Detect, that ctypes.ArgumentError (class OverflowError) appear because of some changes in GUI session. After the RDP reconnect in GUI the error was lost. Wait new case of this + read some article in web
5 years ago
2460a9162d
# Update Python x32 and x64 to v.1.1.8 - need test
5 years ago
4c8d0e3187
v1.1.8 UIDesktop minor bugfix from pywinauto with ctype.ArgumentError
...
Add Orchestrator UserRole model, Add Web render with user roles
5 years ago
0f22e8ebeb
# Python upgrade to pyOpenRPA 1.1.7
5 years ago
4466355318
# Orchestrator::RobotRDPActive: Dont create RDP is session is exist!
5 years ago
ea8233e79d
# Add Orchestrator:WebFront - mGlobal.Processor.Send(inDataList)
5 years ago
636a8e63bb
# Add updated python with openRPA to 1.1.5
5 years ago
77c7cebd04
# Add Activity in RDP: RDPSessionMonitorStop
5 years ago
a08e70f2c1
# Orchestrator RDP Active fixes after Test + UAT (critical fixes)
5 years ago
9fea1e51b1
# Minor fix in logoff RDP procedure
5 years ago
be364e5e42
# Keyboar - hotkey fix with rdp - need UAT
5 years ago
7ca1c2b6b3
# 1.1.3 is released (Orchestrator RDP Active is realy upgraded+ fixed memory leak (need test))
5 years ago
31e2d1a08c
# After testing - ready for stage
5 years ago
f4ed1ff981
# Update the RDP active - improove work of the RDP cmd sent + feedback
5 years ago
4dde6d1501
# Memory leak fix, recovery scenarion in progress, maximize RDP if minimized, minor fixes - remove old files from repo, add GUID in Scheduler item for detect unique item
5 years ago
050616561b
# Add GIT CMD, Add OnClick escape in HTML render control panel
5 years ago
82e5ff9874
# 1.1.2 - add OrchestratorActivity Type GlobalDictKeyListValueOperator+ for merge 2 lists
5 years ago
e8f527d927
# Orchestrator RDPActive fixes : add Command ActivityType GlobalDictKeyListValueOperator+ (to merge 2 lists into 1)
...
Signed-off-by: Ivan Maslov <i.maslov@mail.ru>
5 years ago
d50d1d6fde
# Add Safe turn off functionallity (can kill by taskkill /im ... without /f - force kill)
...
# Add Session logoff in terminator too
5 years ago
f6850187bd
# Minor fixes 1.1.1 (setup py)
5 years ago
18b98d89d3
v1.1.0 After 2 month test prefinal with new improovements (+RobotRDPActive in Orchestrator + Easy ControlPanelTemplate)
5 years ago
b8e4cd82b5
# Prefinal Orchestrator update (RobotRDPActive in Orchestrator)
5 years ago
c4f835b3cf
# Minor fixes in RobotRDPActive # RobotRDPActive SpeedUp
5 years ago
cd8f6bb64c
RobotRDPActive: # Minor fixes/ ActivityListFromOrchestrator/ StartFullscreen fix/ AddFunctions without GDict send
5 years ago
ab91b2a65d
# Safe source run hotfix after first preprod run
5 years ago
04e73eb316
# Testing Orchestrator autorun/ autologin + Orchestrator activity when start orchestrator + instruction
5 years ago
dcbdb0e7da
# Fix in RobotRDPActive (for production run)
5 years ago
bc56245394
# RobotRDPActive - turn on shared drive for file transmition
5 years ago
afe13e9417
# OpenRPA - hot fixes after the first run
5 years ago
fb64808f7a
# HotFix Escape in RobotRDPActive
5 years ago
e4863d89ca
# Prefinal RobotRDPActive OpenRPA test
5 years ago
b02acc1a14
# Beta - dont use as release Tool RobotRDPActive
5 years ago
b3f8da1821
# Add RDPActive CMD Type
5 years ago
29853bd5bd
# Add in pip and in python x32 + x64
5 years ago
d55ed34256
# Created + tested SafeSource!!! You can Create and run crypted .py code
5 years ago
4e5dc7485e
#SafeSource Create tested # Run in prototype
5 years ago
caeab37fbd
#Tool.SafeSource prototype (Crypt/Decrypt)
5 years ago
bedff40503
#FixmemoryLeakOrchestrator #FixMemoryLeakUtilsRobotDB
5 years ago
b842073a77
#Upgrade pyOpenRPA up to version 1.0.40 (uploaded in Pypi)
5 years ago
20e5c0a6b1
#Fix error object RECT is not serializable
...
#Add How to use (Usage.py)
Signed-off-by: Ivan Maslov <Ivan.Maslov@UnicodeLabs.ru>
5 years ago
fb9d29e1a1
#UpgradePackageinPIP
5 years ago
c923087acb
#HotFixes: OrchestratorProcessorStartStop, OrchestratorStartNotRunExplorerWhenRun, UIdesktopFixes, Orchestrator add ProcessStartIfNotStarted
5 years ago
fb3e122783
#RobotDB prefinal
5 years ago
029a5ce67d
#RobotDB (Web <SQLIte>) Insert + XLS export (XLSName, SheetName, FlagExportHeader)
5 years ago
74c355f679
RobotRDPActive: Add Ignore functionality, minor fix
5 years ago
2232774a3c
#RobotRDPActive minor fix (control button in orchestrator) #Setfullscreen
...
#RobotScreenActive minor fin start cmd /K
5 years ago
c30d1f8e6f
v1.0.35 Orchestrator server multythreading + try to fix hang bug
5 years ago
dce6ef0c19
- Orchestrator.Client: Minor fix in rendering table of the modal window
5 years ago
61afbf1cae
- Orchestrator.Server: Add new engine for POST
...
- Orchestrator.Server: Minor Fix to support web view
Signed-off-by: Ivan Maslov <Ivan.Maslov@UnicodeLabs.ru>
5 years ago
90f2b6a568
#Upgrade python/s
5 years ago
f6a364518e
some fixes
5 years ago
b5f67a67dd
- OrchestratorConnector: Was created from IntegrationOrchestrator
...
- OrchestratorConnector: Created Async methods
- Orchestrator minor bug fix in SettingsExample
- OrchestratorConnector: Add AuthToken authorization (Supertoken)
- Orchestrator: check login password correct if auth token is not correct - checked!
- OrchestratorConnector: Fix in interaction between Orchestrator and .py module
- Orchestrator.Processor: Minor fix in GlobalDictKeyListValueGet
- Orchestrator.Processor: Bug fix in GlobalDictKeyListValueSet and GlobalDictKeyListValueGet
- Orchestrator: Add supertoken in Settings
- OrchestratorConnector: Final refactoring
- OrchestratorConnector: If Orchestrator not responding correct - do nothing
- OrchestratorConnector: DataSendAsync, DataSendSync, IntervalDataSendAsync, ConfigurationInit
- Orchestrator.Processor: Return True if GlobalDictKeyListValueSet and minor fix
- OrchestratorConnector: DataReceiveResetAsync, DataSendResetAsync, IntervalDataSendResetAsync, IntervalDataReceiveResetAsync
- OrchestratorConnector: ConfigurationInit - init interval functions from dict configuration
Signed-off-by: Ivan Maslov <Ivan.Maslov@UnicodeLabs.ru>
5 years ago
f5d15bec0b
- Robot: Technical modules go to Utils subpackage
5 years ago
98f22ddb58
- Robot: Add RobotSettings.py to Robot
...
- Robot: Logger to GlobalDict
- Robot: Exclude Robot.py
- Studio: Add Settings.py
- All: Remove print garbage
Signed-off-by: Ivan Maslov <Ivan.Maslov@UnicodeLabs.ru>
5 years ago
4f6b4a8e75
- Tools.RobotRDPActive: ENG version included
...
- Tools.RobotRDPActive: Add Settings template in Utils
- Orchestrator: Auth template fix
- Tools.RobotRDPActive: Added logging
- Studio: Try to create support in IE (works - need test)
Signed-off-by: Ivan Maslov <Ivan.Maslov@UnicodeLabs.ru>
5 years ago
ab193d6022
#Minor fix in setup #OrchestratorClient add feature DataStorage DataStorageKey
5 years ago
bdd32a6e6c
#1.0.31 in pip
5 years ago
816f57a54d
#Orchestrator New URLList engine - test 2 ready
5 years ago
0e25557ea2
Orchestrator new engine test 1 is complete. Need test 2 Restart button fix. All urls in settings
...
Signed-off-by: Ivan Maslov <Ivan.Maslov@UnicodeLabs.ru>
5 years ago
ff5c381a2a
#Orchestrator New URLList engine - need testing!
5 years ago
0b551d152a
#OrchestratorAccessUsers for test
...
Signed-off-by: Ivan Maslov <Ivan.Maslov@UnicodeLabs.ru>
5 years ago
f6ed0cf27a
#Orchestrator AccessUser for test
5 years ago
6d442a424e
#New RobotScreenActive + tested
5 years ago
cac1a84c6a
#v1.0.29 RobotRDPActive minor fix in weight height convertation
5 years ago
6641d54ac2
#Added to python
5 years ago
c71394fa52
#1.0.28 #RobotRDPActive is ready for test
5 years ago
78a97d1051
#RobotRDPActive_60% SessionStart is ok
5 years ago
3d3e504a9a
#RobotRDPActive_dev30%
5 years ago
1c2d3f7b0a
v1.0.27 in Portable python x32 and x64
5 years ago
6c4d52c418
NewWayOfRDPRobot-Create.rdp file and run it
5 years ago
bd0561bfae
#StudioAddMessageModalWhenErrorOnActivityRun
5 years ago
aef5b77d4b
#minorfix
5 years ago
b5ef9e3a13
#UIDesktopBugFix in PWASpecification (catch in SafeProcess function)
...
#Utils/Python goes to Sources pyOpenRPA (not from site-package)
#Minor fix in HTML Studio
5 years ago
927bda7564
#1.0.26 #Robot bug fix + RDPActive robot
5 years ago
e00eb589ac
#1.0.25 #Safe call #UIDesktop (no Robot.py is needed) #Need test
5 years ago
3abf2b1761
#Refactor result Studio Orchestrator
...
Signed-off-by: Ivan Maslov <Ivan.Maslov@UnicodeLabs.ru>
5 years ago
89a178de94
#OrchestratorRefactoring NeedTest
...
Signed-off-by: Ivan Maslov <Ivan.Maslov@UnicodeLabs.ru>
5 years ago
31090d596c
#Refactor part 2
5 years ago
Ivan Maslov
Ivan Maslov