Merge pull request #14 from AxelCarayon/verifiChangements

Verifi changements

registerExperiment.py

-from cmath import e
 import os
-import re
-from xmlrpc.client import Boolean
 import git
 import subprocess
 import yaml
 import hashlib
+import collections
+
+EXPERIMENT_RESUME = "experimentResume.yaml"
 
 path = "./"
 
@@ -26,6 +26,7 @@ outputFiles = []
 currentTag = None
 tags = None
 
+
 def isGitRepo(path) -> bool:
     try:
         git.Repo(path)
@@ -33,6 +34,14 @@ def isGitRepo(path) -> bool:
     except git.exc.InvalidGitRepositoryError:
         return False
 
+def checkForChanges() -> None:
+    changesNotAdded = [ item.a_path for item in repository.index.diff(None) ]
+    changesAdded = [ item.a_path for item in repository.index.diff(repository.head.name) ]
+    untrackedFiles = repository.untracked_files
+
+    if ((len(changesNotAdded) + len(changesAdded) + len(untrackedFiles)) > 0):
+        raise Exception("There are changes in the repository since the last commit, you can only register an experiment from a clean repository.")
+
 def init(pathInput) -> None :
     global repository,path,experimentName,tags, currentTag
     if isGitRepo(pathInput):
@@ -44,6 +53,7 @@ def init(pathInput) -> None :
         os.chdir(path)
     else :
         raise Exception(f"{pathInput} is not a git repository")
+    checkForChanges()
     tags = repository.tags
     currentTag = repository.git.describe('--tags')
     if not(currentVersionIsTagged()):
@@ -121,15 +131,21 @@ def runExperiment() -> None:
 def scanInputFiles() -> None:
     for file in os.listdir(inputFolder):
         if not file.endswith(".gitkeep"):
-            inputFiles.append(file)
+            inputFiles.append(f"{inputFolder}{file}")
 
 def scanOutputsGenerated() -> None:
     for file in os.listdir(outputFolder):
         if not file.endswith(".gitkeep"):
-            outputFiles.append(file)
+            outputFiles.append(f"{outputFolder}{file}")
+
+def checkGeneratedFiles() -> None : 
+    changesNotAdded = [ item.a_path for item in repository.index.diff(None) ]
+    untrackedFiles = repository.untracked_files
+    if collections.Counter(outputFiles + inputFiles) != collections.Counter(untrackedFiles + changesNotAdded):
+        raise Exception("There were files generated or modified outside the input and output folders")
 
 def writeInYaml() -> None:
-    with open("experimentResume.yaml", "r") as yamlFile:
+    with open(EXPERIMENT_RESUME, "r") as yamlFile:
         cur_yaml = yaml.safe_load(yamlFile)
         cur_yaml.update({"name":experimentName})
         cur_yaml.update({"commands":commandsFile})
@@ -140,7 +156,7 @@ def writeInYaml() -> None:
     with open('experimentResume.yaml', 'w') as yamlFile:
         yaml.safe_dump(cur_yaml, yamlFile)
 
-def successfullyCreatedNewBranch(name) -> Boolean :
+def successfullyCreatedNewBranch(name) -> bool :
     try:
         repository.git.checkout('-b',name)
         return True
@@ -171,7 +187,7 @@ def genChecksum(file) -> str :
 def genChecksums() -> list[dict]:
     checksums = []
     for file in outputFiles:
-        checksums.append({file : genChecksum(outputFolder+file)})
+        checksums.append({file : genChecksum(file)})
     return checksums
 
 def run(folder) -> None :
@@ -188,5 +204,6 @@ def run(folder) -> None :
         captureExperiment()
     scanInputFiles()
     scanOutputsGenerated()
+    checkGeneratedFiles()
     writeInYaml()
     pushBranch()
\ No newline at end of file