From a64eb920fdf6f8dbcffb0ec497337ad366373784 Mon Sep 17 00:00:00 2001
From: Chris Mutel <cmutel@gmail.com>
Date: Wed, 3 Feb 2021 14:03:51 +0100
Subject: [PATCH] And store interface arrays as well

---
 bw_processing/datapackage.py        |  14 +++++++++++---
 tests/fixtures/test-fixture.zip     | Bin 4060 -> 4075 bytes
 tests/fixtures/tfd/datapackage.json |  11 ++++++++++-
 tests/integration.py                |  13 +++++++++++--
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/bw_processing/datapackage.py b/bw_processing/datapackage.py
index 40d65e2..ad1c3f5 100644
--- a/bw_processing/datapackage.py
+++ b/bw_processing/datapackage.py
@@ -114,7 +114,7 @@ def get_resource(self, name_or_index: Union[str, int]) -> (Any, dict):
                 obj = self.data[index]()
                 self.data[index] = obj
 
-            self._cache[name_or_index] = self.data[index], self.resources[index]
+            self._cache[name_or_index] = (self.data[index], self.resources[index])
         return self._cache[name_or_index]
 
     def filter_by_attribute(self, key: str, value: Any) -> "FilteredDatapackage":
@@ -604,8 +604,6 @@ def add_dynamic_array(
         )
         name = self._prepare_name(name)
 
-        # Do something with dynamic vector
-
         self._add_numpy_array_resource(
             array=load_bytes(indices_array),
             name=name + ".indices",
@@ -622,6 +620,16 @@ def add_dynamic_array(
                 **kwargs,
             )
 
+        self.data.append(interface)
+        resource = {
+            "profile": "interface",
+            "name": name + ".data",
+            "group": name,
+            "kind": "data",
+        }
+        resource.update(**kwargs)
+        self.resources.append(resource)
+
     def add_csv_metadata(
         self, *, dataframe: pd.DataFrame, valid_for: list, name: str = None, **kwargs
     ) -> None:
diff --git a/tests/fixtures/test-fixture.zip b/tests/fixtures/test-fixture.zip
index af7f892fe14ace412d168018422bf7e7092958b5..c2d751cf3c327e07333b0a03bca892fb99254f53 100644
GIT binary patch
delta 1197
zcmca3|5~0Wz?+#xgn@y9gCV_OB2On1ket4tKE1#>Xyc6KXZABOFtm#?FbDuuq$HLk
z79=KTC#I+BWfkY=y^ZkAziq&?_jx#nW%$O)YYt4vF4nmqS9U8vq(^soRIcab7i%0Z
z{<rfid)0reut_cYwkf-{+E0y7or_ZJ`8XuCbcN?_df3C0?681qQFX+ohckn@PV8Zu
z={V~{J^Pu`l@B*gp04yOHOM1a&M<Mt#$EE?W=?RgUt76rR{Vw6KmSbXb6<G8VlC62
z;#<}(rrb;`XA~TCF*?1(KzZf#gU3o2JhI@`(kRkdw11O=(RPiZzyl{r_ifNHnl4$e
zI?1q~VW$X-i;o_6eacg&kLTvS`Fd>m!kH6y_HBE5aane9eH7~ykGYIi%nPqgwb*=^
zdEM0Zrl3qo9|h$U58f=c$kcrgPcwXdye6V0=(5Y{o?A8rM_TvZ<XFwfU|O$Xu>I-b
z&7bbgvcAfFrS0dwLbu+OX;IIz#Meygn6_WGf3lS0B}efE+S;dCqrLW)bsY+~R8P;J
zQm1Y^;kVk7=@sgKQ})&$<=if?@5J1GXYc*Yx9#~$?>uiYIq4a+j&DvoP)%L>zmvOq
zUv828zrgPQqz5mnl|Q@ut^U96FQbLc#Ygw+Pwr3WbIgvA-_N7H-Ik~7@LSsrORJuJ
z<NZ{=Xx@#2fAIp9U$(~V{JZ1NRCa#72`^cc%9@JaNG+Ou#VqN$<@18P?e#zI9`)E9
z{Z{<>H^1$ZPc2^ZZTqQX)4zJIUY6YQZc!#<-)@=m=|0xi-gUj?`81Wa_=(wN4W1N!
z37531zmFy7W*igvbL}oe$)1+0j8i{y1<BpNHAyzlE_P@9*Zz`u3-_E`{!eFz<dyg9
zQx@%Wsgu&I+Q#=PN6T$i$J*)$;f-@AU8`UB`TVD#1-V??CY=2@Gjs-Xk#x?!Ot)>a
zil0xX2>Bf|nRB7wSFX+6*2_14)Rfrq?QeU2zrA(s8L^m#wS0UlT~#JXJu_|ldurx^
z=}GS+pJYbaJinPcM|{tZ^($6<zGM_H@nnXw_R{9%_Q<K<Iq03_?pQZqN^hF1#8Lsw
z36tlr%mz`Gtd$^Y3+o&Z6~s0jM7?J72T?ZcF(7IddlQI~<A?-Nl^m}@R2t_(5XH&0
z07R|kssT}&+`b^Hg4>G^HJ44kz-=H85`sGe=oCdDhJhuGQj_I*3_!XAd1M&pPtN1f
z0C8pjIX08G@~DD1cYvJjlYjDPf{o%xdbTkYsQ&>F1G6z4ENKj#?8pn&kijd%^p0)v
zZ#I?5t9W@pM(hBJ*t1XeVON^`gO>+v4ts~9x<63&3?LSVo5H}bq;c+KWj-~KE^j^=
zCPj|PdK`+AyZFH7%m9kia7<R<k)FJSLy#}Pn~_O`8CKRz{=g^0m^qo3Uk{|&mS2X6
bhYPH<j9(li($6o$xNh<qel0dFZjgllXV&a?

delta 1262
zcmaDYe@C7tz?+#xgn@y9gJD9>M4nD2AUS<O{e&Fnpbh1IZ#FP7Fsv74U=RSRNJ%V7
zEJ#ewPE1eL%PP*#dpqM`(Jcdkw)ZxzZN)7IQ*LoyFF4~<^kU^)pR|psi;hhT$@EP$
zs{HP?sWZ39&_~htQUSx7yY)-|Zi(uVuWtD=bsDFCWWCcbLxlj=i_B*t|DTa$O}W=}
zM#1+-y-;y%RK=TPrxmN@#1?Dz&oDR>aht!|_r&7*^{%_-#a){H@=I4AoAdgQVXPJJ
z*L?5D5@HE5d?+S-QfKlZo+b0xUtehKdTg>{$%%~-f47QGTp2p?w3A!jr<tJ>SDtBz
z7VfTOIk8khA*m?zh%)zf0r@v4_uc<xVq$D`{o*zov%<CYv8!2CgVGz$Ij#sbopbXg
zWB4g=$CX=Rd=!*ZJb1I%BA@PimfG;EQcTBbW#*z(w_G`k2Z!ozh=vI>WbM;2DSvu&
z^T&g`tS@t4omF$)rrFJ?ShskqcbK=!>HB@j5zH!cOW1aO+N5(M=G9bVk&UNpEvpy*
zxcj2<&Fo2jAM(CT{#DN=oTpkdZMQ`Gw7TwX)$*@)o#)Lw<QcS%?@s%&CBplQ|1ZhA
zUUI9iK45-5XT_g;3G-IezrVlLp5d^t?7zSLf2z|sq7J|Mks8tZR^f&0_U{LHFB{)B
zKk?qhcB9~*{S1{~HpjI7-SOv?G{4@2mn=$UO+`7g7s<X_mh`;#+{2vhN9ymoF1fk(
zTlDj9e%png1_o8H-SjcF_R^}%nG5%3n6a!cl96VZsB749X3^*Qjb9f^I)AV)<aInf
zf9kFUMR5+N9$W9;`uD4{-1k-cCSI%N&Hud8p8w9bSM%#V7sYwm_ln5sPP3Zd<q^Db
z>veO{+Y@t2p4U&C&XgOxAvE*b`8AhhCe%mg|9zvs>A2WT`^1L^G8Yp)+8^gHE-?CM
zB-!5F{ozr~m#@_ycNkB)*~7iz>OsY=T`WO|_Z;02Zz=qv=!Uyk<t(x5m1W}3S;hZv
z5iE_XdS=`#Q=IZN<NZs1<mB!g^iFbjtQ#<CHvzFC5Em!vf>OEeWCxZ^U{094nq@YK
z@?fn5QHNRQfT%>a=^*MCn?H#1W{&|;E7_YslrBdki0a^Y4Wddp7lJ4Wt_2`!7gr64
zvf%awQSIDbe5ko>@_lXtkc=RY3?uhsJsvP80mzv!xt2#m9;CQoarYT_pgWs^SPY0^
zU`eCy<Rd()Al<Kl8dgl^;MD|c;7EG5F%_ul0T82VaGM;!tEvDpw1`tJNf0P61jI@}
z3<FCV@3T$jVpo~Gla~jqu<&Mss{&9~6^KDJ3@m9hV4ob#uB08{&B!Fe3@c5XgV;M1
z)%}60W&p7`Of`^R(%3iIh))gV+$cU7CLxZ=wj7F+XYxU;>2-5CxD=>LhmnCn3q@Bh
z$7FpT>B$fHWI<a0^T{wqO_t%;195!#WtjeQf~8ye#X%zT_+=R9Pu|V1#U{-SG6et)
C;PfQ`

diff --git a/tests/fixtures/tfd/datapackage.json b/tests/fixtures/tfd/datapackage.json
index c8caf0c..2921d47 100644
--- a/tests/fixtures/tfd/datapackage.json
+++ b/tests/fixtures/tfd/datapackage.json
@@ -167,6 +167,15 @@
       "category": "array",
       "nrows": 3
     },
+    {
+      "profile": "interface",
+      "name": "sa-array-interface.data",
+      "group": "sa-array-interface",
+      "kind": "data",
+      "matrix": "sa_matrix",
+      "category": "array",
+      "nrows": 3
+    },
     {
       "profile": "data-resource",
       "mediatype": "text/csv",
@@ -194,7 +203,7 @@
       "valid_for": "sa-data-array"
     }
   ],
-  "created": "2021-02-03T12:36:32.895174Z",
+  "created": "2021-02-03T13:03:15.461858Z",
   "combinatorial": false,
   "sequential": false,
   "seed": null,
diff --git a/tests/integration.py b/tests/integration.py
index 8901227..aa8377b 100644
--- a/tests/integration.py
+++ b/tests/integration.py
@@ -107,7 +107,7 @@ def add_data(dp):
 
 
 def check_data(dp):
-    assert len(dp.resources) == len(dp.data) == 16
+    assert len(dp.resources) == len(dp.data) == 17
     d, _ = dp.get_resource("sa-data-array-json-parameters")
     assert d == ["a", "foo"]
 
@@ -284,6 +284,15 @@ def check_metadata(dp, as_tuples=True):
             "path": "sa-array-interface.indices.npy",
             "group": "sa-array-interface",
         },
+        {
+            "category": "array",
+            "group": "sa-array-interface",
+            "kind": "data",
+            "matrix": "sa_matrix",
+            "name": "sa-array-interface.data",
+            "nrows": 3,
+            "profile": "interface",
+        },
         {
             "profile": "data-resource",
             "mediatype": "text/csv",
@@ -307,7 +316,7 @@ def check_metadata(dp, as_tuples=True):
         },
     ]
     expected_as_list = deepcopy(expected)
-    expected_as_list[13]["valid_for"][0] = list(expected_as_list[13]["valid_for"][0])
+    expected_as_list[14]["valid_for"][0] = list(expected_as_list[14]["valid_for"][0])
     if as_tuples:
         assert dp.metadata["resources"] == expected
     else: