Make datetime more flexible rather than fixed

Signed-off-by: Andrew Sasmito <asasmito1920@gmail.com>

Author: AndrewSasmito

cpp/csp/adapters/csv/CsvInputAdapterManager.cpp

@@ -18,24 +18,53 @@
 
 namespace csp::adapters::csv {
 
-// Parses exactly "YYYY-MM-DD HH::MM::SS"
-DateTime parseFixed_YmdHMS(std::string_view date) {
-  if (date.size() < 19)
-    CSP_THROW(ValueError, "Timestamp too short");
+// Build parser at runtime for extracting date time
+std::function<DateTime(std::string_view)>
+createParser(std::string_view format) {
 
-  auto d2 = [&](size_t i) {
-    return (date[i] - '0') * 10 + (date[i + 1] - '0');
-  };
+  constexpr std::array<std::string_view, 6> date_format = {"YYYY", "MM", "DD",
+                                                           "hh",   "mm", "ss"};
+
+  std::array<int, 6> date_indices;
 
-  int year = d2(0) * 100 + d2(2);
-  int month = d2(5);
-  int day = d2(8);
+  for (int i = 0; i < 6; ++i) {
+    auto pos = format.find(date_format[i]);
 
-  int hour = d2(11);
-  int minute = d2(14);
-  int second = d2(17);
+    date_indices[i] =
+        pos == std::string_view::npos ? -1 : static_cast<int>(pos);
+  }
 
-  return DateTime(year, month, day, hour, minute, second);
+  return [date_indices](std::string_view date) -> DateTime {
+    std::array<int, 6> data = {
+        0, // year
+        0, // month
+        1, // day
+        0, // hour
+        0, // minute
+        0  // second
+    };
+
+    auto d2 = [&](int idx) {
+      return (date[idx] - '0') * 10 + (date[idx + 1] - '0');
+    };
+
+    auto d4 = [&](int idx) {
+      return (date[idx] - '0') * 1000 + (date[idx + 1] - '0') * 100 +
+             (date[idx + 2] - '0') * 10 + (date[idx + 3] - '0');
+    };
+
+    for (int i = 0; i < 6; ++i) {
+      if (date_indices[i] == -1)
+        continue;
+
+      if (i == 0)
+        data[i] = d4(date_indices[i]);
+      else
+        data[i] = d2(date_indices[i]);
+    }
+
+    return DateTime(data[0], data[1], data[2], data[3], data[4], data[5]);
+  };
 }
 
 CsvInputAdapterManager::CsvInputAdapterManager(csp::Engine *engine,
@@ -61,12 +90,10 @@ CsvInputAdapterManager::CsvInputAdapterManager(csp::Engine *engine,
   properties.tryGet("time_format", m_timeFormat);
 
   if (m_timeFormat.empty()) {
-    dateParser = parseFixed_YmdHMS;
-  } else if (m_timeFormat == "YYYY-MM-DD HH::MM::SS") {
-    dateParser = parseFixed_YmdHMS;
-  } else {
-    CSP_THROW(ValueError, "Time format not supported");
+    CSP_THROW(ValueError, "Time format must be provided");
   }
+
+  dateParser = createParser(m_timeFormat);
 }
 
 CsvInputAdapterManager::~CsvInputAdapterManager() = default;
@@ -299,24 +326,21 @@ void CsvInputAdapterManager::bindSubscriberDispatchers() {
 
         auto col = colIndex.find(csvColumn);
 
-        CSP_TRUE_OR_THROW_RUNTIME(
-            col != colIndex.end(),
-            "Column '" << csvColumn << "' not found in CSV header");
+        CSP_TRUE_OR_THROW_RUNTIME(col != colIndex.end(),
+                                  "Column '" << csvColumn
+                                             << "' not found in CSV header");
 
         auto field = meta->field(structField);
 
-        CSP_TRUE_OR_THROW_RUNTIME(
-            field,
-            "Field '" << structField << "' not found in struct");
+        CSP_TRUE_OR_THROW_RUNTIME(field, "Field '" << structField
+                                                   << "' not found in struct");
 
         size_t idx = col->second;
 
         subscription.m_fieldSetters.push_back(
             [idx, field](StructPtr &s,
                          const std::vector<std::string_view> &cols) {
-              field->setValue<std::string>(
-                  s.get(),
-                  std::string(cols[idx]));
+              field->setValue<std::string>(s.get(), std::string(cols[idx]));
             });
       }
 

cpp/csp/adapters/csv/CsvInputAdapterManager.h

@@ -16,14 +16,6 @@
 
 namespace csp::adapters::csv {
 
-// Manages all csv input adapters for a single engine run.
-//
-// Lifecycle:
-//   1. Registration:  getInputAdapter() called per subscription (before engine
-//   starts)
-//   2. start():       create processors → wire adapters → read first row
-//   3. processNextSimTimeSlice():  skip/dispatch loop per engine tick
-//   4. stop():        tear down all state
 class CsvInputAdapterManager final : public csp::AdapterManager {
 public:
   CsvInputAdapterManager(csp::Engine *engine, const Dictionary &properties);
@@ -80,7 +72,7 @@ class CsvInputAdapterManager final : public csp::AdapterManager {
   // populated.
   void bindSubscriberDispatchers();
 
-  using dateTimeParserfn = DateTime (*)(std::string_view);
+  using dateTimeParserfn = std::function<DateTime(std::string_view)>;
 
   // Registration-phase state (populated by getInputAdapter before start)
   std::vector<Subscriber> m_subscribers;

csp/adapters/csv.py

@@ -44,6 +44,15 @@ def subscribe(
             push_mode=push_mode,
         )
 
+    def subscribe_all(
+        self,
+        ts_type,
+        field_map=None,
+        symbol=None,
+        push_mode=PushMode.LAST_VALUE,
+    ):
+        return self.subscribe(ts_type, field_map, symbol, push_mode)  # Legacy API
+
     def _create(self, engine, memo):
         return _csvadapterimpl._csv_adapter_manager(engine, self._properties)
 

csp/tests/adapters/csv_test_data.csv

@@ -1,8 +1,8 @@
 TIME|SYMBOL|PRICE|SIZE|SIDE
-2020-03-03 09:30:00|AAPL|500.00|100|BUY
-2020-03-03 09:30:01|IBM|100.00|200|BUY
-2020-03-03 09:30:02|AAPL|400.00|100|BUY
-2020-03-03 09:30:03|IBM|200.00|300|SELL
-2020-03-03 09:30:04|AAPL|300.00|200|SELL
-2020-03-03 09:30:05|AAPL|200.00|400|BUY
-2020-03-03 09:30:06|GM|2.00|1|BUY
+20200303 09:30:00|AAPL|500.00|100|BUY
+20200303 09:30:01|IBM|100.00|200|BUY
+20200303 09:30:02|AAPL|400.00|100|BUY
+20200303 09:30:03|IBM|200.00|300|SELL
+20200303 09:30:04|AAPL|300.00|200|SELL
+20200303 09:30:05|AAPL|200.00|400|BUY
+20200303 09:30:06|GM|2.00|1|BUY

csp/tests/adapters/test_csv.py

@@ -30,6 +30,7 @@ def graph():
                 time_column="TIME",
                 symbol_column="SYMBOL",
                 delimiter="|",
+                time_format="YYYYMMDD hh:mm:ss",
             )
 
             # Struct
@@ -47,7 +48,7 @@ def graph():
             aapl_price = reader.subscribe(str, symbol="AAPL", field_map="PRICE")
 
             # all data
-            all = reader.subscribe(PriceQuantity)
+            all = reader.subscribe_all(PriceQuantity)
 
             csp.add_graph_output("aapl", aapl)
             csp.add_graph_output("ibm", ibm)
@@ -92,10 +93,7 @@ def graph():
 
     def test_starttime(self):
         reader = CsvAdapterManager(
-            self._filename,
-            time_column="TIME",
-            symbol_column="SYMBOL",
-            delimiter="|",
+            self._filename, time_column="TIME", symbol_column="SYMBOL", delimiter="|", time_format="YYYYMMDD hh:mm:ss"
         )
         aapl = reader.subscribe(str, symbol="AAPL", field_map="PRICE")