Changeset 9395 for branches/OaaS/HeuristicLab.Services.Optimization.Controller

Timestamp:

04/24/13 13:40:43 (12 years ago)

Author:

fschoepp

Message:

#1888:

• Added visual extensions (dynamic JavaScript) which will be used to render additional result parameters specific to scenarios (e. g. create a graphical representation of a TSP).
• Added relationship between jobs and experiments (otherwise, it's not possible to get the job's experiment).
• Updated Admin page to allow removal/addition of visual extensions.
• Added back-end logic to store/retrieve/delete visual extensions.
• Added visual extension functionality to the JavaScript views/controllers (job.*.js).
• Added tsp.js which is a visual extension for the "Genetic Algorithm - TSP" scenario. It adds a graphical representation of the TSP (just like the C# version does) to the results.

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Controller

Files:

• Azure/DAL.cs (modified) (4 diffs)
• HL/HiveScenarioManager.cs (modified) (6 diffs)
• Interfaces/DAL.cs (modified) (3 diffs)
• Interfaces/IControllerService.cs (modified) (2 diffs)
• Interfaces/IScenarioManager.cs (modified) (1 diff)
• Interfaces/Model/ControllerModel.cs (modified) (2 diffs)
• Mockup/MockupDAL.cs (modified) (1 diff)
• Mockup/MockupScenarioManager.cs (modified) (1 diff)
• Parsers/AlgorithmConverter.cs (modified) (1 diff)
• PlaceholderControllerService.cs (modified) (2 diffs)

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Azure/DAL.cs

@@ -18 +18 @@
     public static readonly string EXPERIMENT_BLOB_CONTAINER = "experiment";
     public static readonly string VISUAL_BLOB_CONTAINER = "visualextensions";
+    public static readonly string JOB_TABLE = "Job";
     public static readonly string CLOUD_SETTINGS_KEY = "Cloudia.WindowsAzure.Storage";
 
@@ -311 +312 @@
 
     public string FindById(string algorithmId) {
-      CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.VISUAL_BLOB_CONTAINER);
-      container.CreateIfNotExist();
-      var blob = container.GetBlobReference(algorithmId);
-      return blob.DownloadText();
+      try {
+        CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.VISUAL_BLOB_CONTAINER);
+        container.CreateIfNotExist();
+        var blob = container.GetBlobReference(algorithmId);
+        return blob.DownloadText();
+      }
+      catch (Exception ex) {
+        Trace.TraceError(ex.ToString());
+        return null;
+      }
+    }
+
+
+    public bool Exists(string algorithmId) {
+      try {
+        CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.VISUAL_BLOB_CONTAINER);
+        container.CreateIfNotExist();
+        var blob = container.GetBlobReference(algorithmId);
+        blob.FetchAttributes();
+        return true;
+      }
+      catch (StorageClientException ex) {
+        if (ex.ErrorCode == StorageErrorCode.ResourceNotFound) {
+          return false;
+        }
+        Trace.TraceError(ex.ToString());
+        return false;
+      }
+    }
+  }
+
+  internal sealed class JobEntity : TableServiceEntity {
+    public JobEntity() {
+    }
+
+    public JobEntity(string user, string experimentName, string experimentId, string jobId) {
+      PartitionKey = "JobPartition";
+      RowKey = user + "_" + jobId;
+      User = user;
+      ExperimentId = experimentId;
+      JobId = jobId;
+    }
+
+    public string ExperimentId { get; set; }
+
+    public string User { get; set; }
+
+    public string JobId { get; set; }
+  }
+
+  public class JobDao : IJobDao {
+    public IExperimentDao ExperimentDao { get; set; }
+    public CloudTableClient TableClient { get; set; }
+
+    public bool Add(string username, Experiment experiment, string jobId) {
+      try {
+        TableServiceContext serviceContext = TableClient.GetDataServiceContext();
+        TableClient.CreateTableIfNotExist(AzureConstants.JOB_TABLE);
+        serviceContext.AddObject(AzureConstants.JOB_TABLE,
+          new JobEntity(username, experiment.Name, experiment.Id, jobId)
+        );
+        serviceContext.SaveChangesWithRetries();
+        return true;
+      }
+      catch (Exception ex) {
+        Trace.TraceError(ex.ToString());
+        return false;
+      }
+    }
+
+    public bool Delete(string username, string jobId) {
+      try {
+        TableServiceContext serviceContext = TableClient.GetDataServiceContext();
+        TableClient.CreateTableIfNotExist(AzureConstants.JOB_TABLE);
+        var entity = (from e in serviceContext.CreateQuery<JobEntity>(AzureConstants.JOB_TABLE)
+                      where e.JobId == jobId && e.User == username
+                      select e).FirstOrDefault();
+        serviceContext.DeleteObject(entity);        
+        return true;
+      }
+      catch (Exception ex) {
+        Trace.TraceError(ex.ToString());
+        return false;
+      }
+    }
+
+    public Experiment FindByJobId(string username, string jobId) {
+      try {
+        TableServiceContext serviceContext = TableClient.GetDataServiceContext();
+        TableClient.CreateTableIfNotExist(AzureConstants.JOB_TABLE);
+        var entity = (from e in serviceContext.CreateQuery<JobEntity>(AzureConstants.JOB_TABLE)
+                      where e.JobId == jobId && e.User == username
+                      select e).FirstOrDefault();
+        return ExperimentDao.GetExperimentById(new User() { Username = username }, entity.ExperimentId);
+      }
+      catch (Exception ex) {
+        Trace.TraceError(ex.ToString());
+        return null;
+      }
     }
   }
@@ -323 +419 @@
     private IExperimentDao expDao;
     private IVisualExtensionDao visualDao;
+    private IJobDao jobDao;
 
     private CloudStorageAccount storageAccount;
@@ -377 +474 @@
       }
     }
+
+
+    public IJobDao JobDao {
+      get {
+        if (jobDao == null) {
+          jobDao = new JobDao() { ExperimentDao = ExperimentDao, TableClient = StorageAccount.CreateCloudTableClient() };
+        }
+        return jobDao;
+      }
+    }
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/HL/HiveScenarioManager.cs

@@ -110 +110 @@
             IAlgorithm algo;
             mapper.MapScenario(optScen, out algo);
+            algo.Name = child.Id;
             entry.Parent.Optimizers.Add(algo);
           }  
@@ -115 +116 @@
       }
       details.JobTitle = exp.Name;
-      return SendExperimentToHive(user, hiveExperiment, details) != null;
+      var jobId = SendExperimentToHive(user, hiveExperiment, details);
+
+      // add relationship to azure tablestorage      
+      if (jobId != null) {
+        dal.JobDao.Add(user.Username, exp, jobId);
+      }
+      return jobId != null;
     }
 
@@ -214 +221 @@
       HiveServiceLocator.Instance.Password = user.Password;
       HiveServiceLocator.Instance.EndpointConfigurationName = Configuration.HiveEndpointName;
-      HiveClient.StartJob((ex) => { 
-        Console.WriteLine(ex.StackTrace); 
-      }, job, new CancellationToken());
+      HiveClient.Store(job, new CancellationToken());
       
       job.StopResultPolling();
@@ -286 +291 @@
         }
       }
+      //var experiment = dal.JobDao.FindByJobId(user.Username, id);
+
       IDictionary<Guid, HiveTask> hiveTasks = downloader.Results;
       IList<Model.Run> runs = new List<Model.Run>();
@@ -294 +301 @@
             Model.Run taskRun = new Model.Run();
             taskRun.Id = taskRun.Name = run.Name;
-            taskRun.AlgorithmName = run.Algorithm != null ? run.Algorithm.Name : run.Name;
+            // We try to extract the original algorithm name here
+            var index = taskRun.Name.LastIndexOf(" Run ");
+            var algorithName = taskRun.Name.Substring(0, index);
+            taskRun.AlgorithmName = algorithName;
+            if (taskRun.AlgorithmName == null)
+              taskRun.AlgorithmName = run.Algorithm != null ? run.Algorithm.Name : run.Name;
+            
             IList<Parameter> resultValues = new List<Model.Parameter>();
             foreach (var key in run.Results.Keys) {
@@ -617 +630 @@
       return dal.VisualExtensionDao.FindById(algorithmId);
     }
+
+
+    public bool AddVisualExtension(string algorithmId, string script) {
+      return dal.VisualExtensionDao.Add(algorithmId, script);
+    }
+
+    public bool DeleteVisualExtension(string algorithmId) {
+      return dal.VisualExtensionDao.DeleteById(algorithmId);
+    }
+
+
+    public bool ExistsVisualExtension(string algorithmId) {
+      return dal.VisualExtensionDao.Exists(algorithmId);
+    }
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Interfaces/DAL.cs

@@ -30 +30 @@
   }
 
+  public interface IJobDao {
+    bool Add(string username, Experiment experiment, string jobId);
+    bool Delete(string username, string jobId);
+    Experiment FindByJobId(string username, string jobId);
+  }
+
   public interface IBlobDao {
     bool Add(StringEntry entry);
@@ -41 +47 @@
     bool DeleteById(string algorithmId);
     string FindById(string algorithmId);
+    bool Exists(string algorithmId);
   }
 
@@ -48 +55 @@
     IExperimentDao ExperimentDao { get; }
     IVisualExtensionDao VisualExtensionDao { get; }
+    IJobDao JobDao { get; }
   }
 

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Interfaces/IControllerService.cs

@@ -68 +68 @@
 
     [OperationContract]
-    string GetVisualExtension(string algorithmId);
+    VisualExtension GetVisualExtension(string algorithmId);
 
     [OperationContract]
@@ -75 +75 @@
     [OperationContract]
     bool DeleteVisualExtension(string algorithmId);
+
+    [OperationContract]
+    bool ExistsVisualExtension(string algorithmId);
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Interfaces/IScenarioManager.cs

@@ -30 +30 @@
 
     string GetVisualExtension(string algorithmId);
+
+    bool AddVisualExtension(string algorithmId, string script);
+
+    bool DeleteVisualExtension(string algorithmId);
+
+    bool ExistsVisualExtension(string algorithmId);
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Interfaces/Model/ControllerModel.cs

@@ -467 +467 @@
       set { tasks = value; }
     }
-
+  }
+
+  [DataContract]
+  public class VisualExtension {
+    [DataMember]
+    public string ScenarioId { get; set; }
+
+    [DataMember]
+    public string ScenarioJs { get; set; }
   }
 
@@ -484 +492 @@
     public IList<Parameter> InputParameters { get; set; }
 
+    [DataMember]
     public string AlgorithmName { get; set; }
   }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Mockup/MockupDAL.cs

@@ -258 +258 @@
       get { throw new NotImplementedException(); }
     }
+
+
+    public IJobDao JobDao {
+      get { throw new NotImplementedException(); }
+    }
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Mockup/MockupScenarioManager.cs

@@ -291 +291 @@
       throw new NotImplementedException();
     }
+
+
+    public bool AddVisualExtension(string algorithmId, string script) {
+      throw new NotImplementedException();
+    }
+
+    public bool DeleteVisualExtension(string algorithmId) {
+      throw new NotImplementedException();
+    }
+
+
+    public bool ExistsVisualExtension(string algorithmId) {
+      throw new NotImplementedException();
+    }
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Parsers/AlgorithmConverter.cs

@@ -190 +190 @@
       jrun["results"] = ConvertParametersToJson(run.Results);
       jrun["params"] = ConvertParametersToJson(run.InputParameters);
-      jrun["algorithmName"] = run.AlgorithmName;
+      jrun["algorithmName"] = run.AlgorithmName;      
       return jrun;
     }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/PlaceholderControllerService.cs

@@ -100 +100 @@
       var added = hiveManager.AddScenario(user, scenario.Id, scenarioXml, scenarioMapper);
       if (added)
-        scenarios.Add(scenario);
+        scenarios.Add(scenario);      
       return added;
     }
@@ -192 +192 @@
 
 
-    public string GetVisualExtension(string algorithmId) {
-      return hiveManager.GetVisualExtension(algorithmId);
+    public VisualExtension GetVisualExtension(string algorithmId) {
+      return new VisualExtension() { ScenarioId = algorithmId, ScenarioJs = hiveManager.GetVisualExtension(algorithmId) };
     }
 
 
     public bool AddVisualExtension(string algorithmId, string script) {
-      //return hiveManager.AddVisualExtension(algorithmId, script);
-      return true;
+      return hiveManager.AddVisualExtension(algorithmId, script);
     }
 
     public bool DeleteVisualExtension(string algorithmId) {
-      //return hiveManager.DeleteVisualExtension(algorithmId);
-      return true;
+      return hiveManager.DeleteVisualExtension(algorithmId);
+    }
+
+
+    public bool ExistsVisualExtension(string algorithmId) {
+      return hiveManager.ExistsVisualExtension(algorithmId);
     }
   }